make complete and don't overlap

[unix-history] / usr / src / include / Makefile

diff --git a/usr/src/include/Makefile b/usr/src/include/Makefile
index ce8284c..8d2acac 100644 (file)
--- a/usr/src/include/Makefile
+++ b/usr/src/include/Makefile
@@ -3,7 +3,7 @@
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #

-#      @(#)Makefile    5.13 (Berkeley) 86/05/11
+#      @(#)Makefile    5.21 (Berkeley) 88/07/14

 #
 # Doing a make install builds /usr/include
 #
 #
 # Doing a make install builds /usr/include
 #


@@ -19,15 +19,15 @@
 DESTDIR=
 SUBDIRS=arpa pascal protocols
 STD=   a.out.h ar.h assert.h ctype.h curses.h ndbm.h disktab.h \
 DESTDIR=
 SUBDIRS=arpa pascal protocols
 STD=   a.out.h ar.h assert.h ctype.h curses.h ndbm.h disktab.h \

-       fcntl.h fstab.h grp.h lastlog.h math.h memory.h mp.h mtab.h \
-       netdb.h nlist.h pcc.h pwd.h ranlib.h resolv.h setjmp.h \
-       sgtty.h stab.h stdio.h string.h strings.h struct.h syscall.h \
-       sysexits.h time.h ttyent.h utmp.h varargs.h vfont.h
+       fcntl.h fstab.h ftw.h grp.h lastlog.h math.h memory.h mp.h mtab.h \
+       netdb.h nlist.h pcc.h pwd.h ranlib.h regexp.h resolv.h setjmp.h \
+       sgtty.h stab.h stdio.h string.h strings.h struct.h \
+       sysexits.h time.h ttyent.h tzfile.h utmp.h varargs.h vfont.h

 LINKS= errno.h signal.h syslog.h
 LINKS= errno.h signal.h syslog.h

-MACHINE=vax
-MACHDEP=${MACHINE} vaxif vaxmba vaxuba
-NETDIRS=net netimp netinet netns
-SYSDIRS=${NETDIRS} stand ${MACHDEP}
+
+NETDIRS=       net netimp netinet netns
+TAHOEDIRS=     tahoe tahoemath tahoevba tahoeif
+VAXDIRS=       vax vaxmba vaxuba vaxif

 SHARED=        symlinks
 TAGSFILE=tags
 
 SHARED=        symlinks
 TAGSFILE=tags
 


@@ -48,7 +48,7 @@ install: ${SHARED}
                        install -c -m 444 $$j ${DESTDIR}/usr/include/$$i/$$j; \
                done); \
        done
                        install -c -m 444 $$j ${DESTDIR}/usr/include/$$i/$$j; \
                done); \
        done

-       cmp -s Makefile.install ${DESTDIR}/usr/include/Makefile || \
+       -cmp -s Makefile.install ${DESTDIR}/usr/include/Makefile || \

            install -c -m 444 Makefile.install ${DESTDIR}/usr/include/Makefile
        -for i in ${LINKS}; do \
                rm -f ${DESTDIR}/usr/include/$$i; \
            install -c -m 444 Makefile.install ${DESTDIR}/usr/include/Makefile
        -for i in ${LINKS}; do \
                rm -f ${DESTDIR}/usr/include/$$i; \


@@ -59,8 +59,17 @@ install: ${SHARED}
        rm -f ${DESTDIR}/usr/include/frame.h
        ln -s machine/frame.h ${DESTDIR}/usr/include/frame.h
 
        rm -f ${DESTDIR}/usr/include/frame.h
        ln -s machine/frame.h ${DESTDIR}/usr/include/frame.h
 

-symlinks:
-       -for i in ${SYSDIRS}; do \
+symlinks: ${MACHINE}.symlinks
+       rm -rf ${DESTDIR}/usr/include/sys
+       -if [ ! -s ${DESTDIR}/usr/include/sys ]; \
+       then \
+               ln -s /sys/h ${DESTDIR}/usr/include/sys; \
+       else \
+               echo ${DESTDIR}/usr/include/sys not removed; \
+       fi
+
+tahoe.symlinks:
+       -for i in ${NETDIRS} ${TAHOEDIRS}; do \

                rm -rf ${DESTDIR}/usr/include/$$i; \
                if [ ! -s ${DESTDIR}/usr/include/$$i ]; \
                then \
                rm -rf ${DESTDIR}/usr/include/$$i; \
                if [ ! -s ${DESTDIR}/usr/include/$$i ]; \
                then \


@@ -69,25 +78,38 @@ symlinks:
                        echo ${DESTDIR}/usr/include/$$i not removed; \
                fi; \
        done
                        echo ${DESTDIR}/usr/include/$$i not removed; \
                fi; \
        done

-       rm -rf ${DESTDIR}/usr/include/sys
-       -if [ ! -s ${DESTDIR}/usr/include/sys ]; \
-       then \
-               ln -s /sys/h ${DESTDIR}/usr/include/sys; \
-       else \
-               echo ${DESTDIR}/usr/include/sys not removed; \
-       fi

 
 

-copies:
-       -for i in ${SYSDIRS}; do \
+vax.symlinks:
+       -for i in ${NETDIRS} ${VAXDIRS}; do \

                rm -rf ${DESTDIR}/usr/include/$$i; \
                rm -rf ${DESTDIR}/usr/include/$$i; \

-               cd /sys; \
-               tar cf - $$i/*.h | (cd ${DESTDIR}/usr/include; tar xpfB -); \
+               if [ ! -s ${DESTDIR}/usr/include/$$i ]; \
+               then \
+                       ln -s /sys/$$i ${DESTDIR}/usr/include/$$i; \
+               else \
+                       echo ${DESTDIR}/usr/include/$$i not removed; \
+               fi; \

        done
        done

+
+copies: ${MACHINE}.copies

        rm -rf ${DESTDIR}/usr/include/sys;
        mkdir ${DESTDIR}/usr/include/sys; 
        chmod 775 ${DESTDIR}/usr/include/sys;
        -(cd /sys/h; tar cf - *.h | (cd ${DESTDIR}/usr/include/sys; tar xpfB -))
 
        rm -rf ${DESTDIR}/usr/include/sys;
        mkdir ${DESTDIR}/usr/include/sys; 
        chmod 775 ${DESTDIR}/usr/include/sys;
        -(cd /sys/h; tar cf - *.h | (cd ${DESTDIR}/usr/include/sys; tar xpfB -))
 

+tahoe.copies:
+       -for i in ${NETDIRS} ${TAHOEDIRS}; do \
+               rm -rf ${DESTDIR}/usr/include/$$i; \
+               cd /sys; \
+               tar cf - $$i/*.h | (cd ${DESTDIR}/usr/include; tar xpfB -); \
+       done
+
+vax.copies:
+       -for i in ${NETDIRS} ${VAXDIRS}; do \
+               rm -rf ${DESTDIR}/usr/include/$$i; \
+               cd /sys; \
+               tar cf - $$i/*.h | (cd ${DESTDIR}/usr/include; tar xpfB -); \
+       done
+

 tags:
        cwd=/usr/include; \
        for i in ${STD} ${LINKS}; do \
 tags:
        cwd=/usr/include; \
        for i in ${STD} ${LINKS}; do \


@@ -96,3 +118,5 @@ tags:
 
 clean:
        rm -f tags
 
 clean:
        rm -f tags

+
+depend: