more work on the tags

SCCS-vsn: sys/kern/Makefile 7.7

diff --git a/usr/src/sys/kern/Makefile b/usr/src/sys/kern/Makefile
index 1bf1b7a..10c2903 100644 (file)
--- a/usr/src/sys/kern/Makefile
+++ b/usr/src/sys/kern/Makefile
@@ -12,46 +12,37 @@
 # from this software without specific prior written permission.
 # THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # from this software without specific prior written permission.
 # THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED

-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

 #
 #

-#      @(#)Makefile    7.6 (Berkeley) %G%
+#      @(#)Makefile    7.7 (Berkeley) %G%

 #
 #

-# Put the ../h stuff near the end so that subroutine definitions win when
+# Put the ../sys stuff near the end so that subroutine definitions win when

 # there is a struct tag with the same name (eg., vmmeter).  The real
 # solution would probably be for ctags to generate "struct vmmeter" tags.
 
 # there is a struct tag with the same name (eg., vmmeter).  The real
 # solution would probably be for ctags to generate "struct vmmeter" tags.
 

+COMM=  ../net/*.[ch] ../netimp/*.[ch] ../netinet/*.[ch] ../netns/*.[ch] \
+       ../kern/*.[ch] ../ufs/*.[ch] ../nfs/*.[ch]
+HDR=   ../sys/*.h

 TVAX=  ../vax/tags
 TVAX=  ../vax/tags

-SVAX=  ../net/*.[ch] ../netimp/*.[ch] ../netinet/*.[ch] ../netns/*.[ch] \
-       ../sys/*.[ch] ../vaxif/*.[ch]  ../vaxmba/*.[ch] ../vaxuba/*.[ch] \
-       ../vax/*.[ch] ../h/*.h
+SVAX=  ../vaxif/*.[ch]  ../vaxmba/*.[ch] ../vaxuba/*.[ch] ../vax/*.[ch]

 AVAX=  ../vax/*.s
 
 TTAHOE=        ../tahoe/tags
 AVAX=  ../vax/*.s
 
 TTAHOE=        ../tahoe/tags

-STAHOE=        ../net/*.[ch] ../netimp/*.[ch] ../netinet/*.[ch] ../netns/*.[ch] \
-       ../sys/*.[ch] ../tahoeif/*.[ch]  ../tahoevba/*.[ch] ../tahoe/*.[ch] \
-       ../h/*.h
+STAHOE=        ../tahoeif/*.[ch]  ../tahoevba/*.[ch] ../tahoe/*.[ch]

 ATAHOE=        ../tahoe/*.s
 
 ATAHOE=        ../tahoe/*.s
 

-DGEN=  h sys net netimp netinet netns
+# Directories in which to place tags links (other than primary T$MACH)
+DGEN=  kern sys net netimp netinet netns ufs

 DVAX=  vaxif vaxmba vaxuba
 DTAHOE=        tahoeif tahoevba
 
 all:
        @echo "make tags or links only"
 
 DVAX=  vaxif vaxmba vaxuba
 DTAHOE=        tahoeif tahoevba
 
 all:
        @echo "make tags or links only"
 

-tags: FRC
-       -mv ${TVAX} ${TVAX}.old
-       ctags -dtf ${TVAX} ${SVAX}
-       egrep "^SCBVEC(.*)" ${AVAX} | \
-sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);X\3 \1 /^\2(\3\4$$/;" \
-               >> ${TVAX}
-       egrep "^ENTRY(.*)|^JSBENTRY(.*)" ${AVAX} | \
-sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
-               >> ${TVAX}
-       sort -o ${TVAX} ${TVAX}
-       rm -f ${TVAX}.old
-       -mv ${TTAHOE} ${TTAHOE}.old
-       ctags -dtf ${TTAHOE} ${STAHOE}
+tags: tahoetags vaxtags
+
+tahoetags:
+       -ctags -dtf ${TTAHOE} ${COMM} ${STAHOE} ${HDR}

        egrep "^SCBVEC(.*)" ${ATAHOE} | \
 sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);X\3 \1 /^\2(\3\4$$/;" \
                >> ${TTAHOE}
        egrep "^SCBVEC(.*)" ${ATAHOE} | \
 sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);X\3 \1 /^\2(\3\4$$/;" \
                >> ${TTAHOE}


@@ -59,14 +50,28 @@ sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);X\3 \1 /^\2(\3\4$$/;" \
 sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
                >> ${TTAHOE}
        sort -o ${TTAHOE} ${TTAHOE}
 sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
                >> ${TTAHOE}
        sort -o ${TTAHOE} ${TTAHOE}

-       rm -f ${TTAHOE}.old
+
+vaxtags:
+       -ctags -dtf ${TVAX} ${COMM} ${SVAX} ${HDR}
+       egrep "^SCBVEC(.*)" ${AVAX} | \
+sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);X\3 \1 /^\2(\3\4$$/;" \
+               >> ${TVAX}
+       egrep "^ENTRY(.*)|^JSBENTRY(.*)" ${AVAX} | \
+sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
+               >> ${TVAX}
+       sort -o ${TVAX} ${TVAX}

 
 links:
 
 links:

-       -for i in ${DVAX}; do rm -f ../$$i/tags; \
-       ln -s ../vax/tags ../$$i/tags; done
-       -for i in ${DTAHOE}; do rm -f ../$$i/tags; \
-       ln -s ../tahoe/tags ../$$i/tags; done
-       -for i in ${DGEN}; do rm -f ../$$i/tags; \
-       ln -s ../machine/tags ../$$i/tags; done
+       -for i in ${DVAX}; do \
+           rm -f ../$$i/tags; ln -s ../vax/tags ../$$i/tags; done
+       -for i in ${DTAHOE}; do \
+           rm -f ../$$i/tags; ln -s ../tahoe/tags ../$$i/tags; done
+       -for i in ${DGEN}; do \
+           rm -f ../$$i/tags; \
+           ln -s ../tahoe/tags ../$$i/tags; done

 
 

-FRC:
+init_sysent.c syscalls.c ../sys/syscall.h: syscalls.master
+       -mv init_sysent.c init_sysent.c.bak
+       -mv syscalls.c syscalls.c.bak
+       -mv ../sys/syscall.h ../sys/syscall.h.bak
+       sh makesyscalls.sh syscalls.master