STABLE14-sys-syscall-object-dependency-20080107

LICENSE IPL10

make syscall.o always be created, some makes don't deal with the implicit requirement

(cherry picked from commit 777a2840878af313e062c4885ae7002bad62bdf4)

diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in
index 3c7b25848a5cbb518f224accdae739c12ee7cbf5..70835b92132faa6784da5cc5d1be8e85f21da0d7 100644 (file)
--- a/src/sys/Makefile.in
+++ b/src/sys/Makefile.in
@@ -1,3 +1,8 @@
+# API version. When something changes, increment as appropriate. 
+# Ignore at your own risk.
+LIBAFSSETPAGMAJOR=1
+LIBAFSSETPAGMINOR=0
+
 # Copyright 2000, International Business Machines Corporation and others.
 # All Rights Reserved.
 # 
@@ -14,10 +19,13 @@ CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR}  ${XCF
 SFLAGS=-I${TOP_INCDIR}
 LIBS=libsys.a ${TOP_LIBDIR}/librx.a libsys.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/util.a ${XLIBS}
 
-OBJECTS= afssyscalls.o setpag.o glue.o syscall.o
-SHLIBOBJS = picobj/setpag.o picobj/glue.o syscall.o
+OBJECTS= afssyscalls.o setpag.o glue.o
+SHLIBOBJS = picobj/setpag.o picobj/glue.o
 RMTOBJS=rmtsysnet.o rmtsysc.o rmtsys.cs.o rmtsys.xdr.o rmtsys.ss.o rmtsyss.o 
 
+LIBAFSSETPAG = libafssetpag.${SHLIB_SUFFIX}.${LIBAFSSETPAGMAJOR}.${LIBAFSSETPAGMINOR}
+LIBAFSSETPAG_DARWIN = libafssetpag.${LIBAFSSETPAGMAJOR}.${SHLIB_SUFFIX}
+
 all: \
     rmtsysd \
     pagsh \
@@ -31,23 +39,56 @@ all: \
     ${KERNELDIR}/afs/xfsattrs.h \
     ${UKERNELDIR}/afs \
     ${UKERNELDIR}/afs/afsl.exp
+       @set -x; case ${SYS_NAME} in \
+       *_darwin_*) \
+           ${MAKE} '${TOP_LIBDIR}/${LIBAFSSETPAG_DARWIN}';; \
+       *) \
+           ${MAKE} '${TOP_LIBDIR}/${LIBAFSSETPAG}';; \
+       esac
 
-libsys.a: ${OBJECTS} ${RMTOBJS} afsl.exp AFS_component_version_number.o
+libsys.a: ${OBJECTS} ${RMTOBJS} syscall.o afsl.exp AFS_component_version_number.o
        -$(RM) -f $@
-       $(AR) crv $@ ${OBJECTS} ${RMTOBJS} \
-               AFS_component_version_number.o ${LIBSYS_AIX_EXP}
+       @set -x; case "${SYS_NAME}" in                          \
+               hp_ux11*) \
+                       $(AR) crv $@ ${OBJECTS} ${RMTOBJS} \
+                               AFS_component_version_number.o ${LIBSYS_AIX_EXP} ;; \
+               *) \
+                       $(AR) crv $@ ${OBJECTS} ${RMTOBJS} syscall.o \
+                               AFS_component_version_number.o ${LIBSYS_AIX_EXP} ;; \
+       esac
        $(RANLIB) $@
        @set -x; case "${SYS_NAME}" in                          \
                rs_aix*)                                \
                        $(AR) crv $@ afsl.exp;;         \
        esac
 
+${LIBAFSSETPAG}: ${SHLIBOBJS} syscall.o
+       @set -x; case ${SYS_NAME} in \
+       *_linux*) \
+           ${SHLIB_LINKER} -Wl,-h,libafssetpag.so.${LIBAFSSETPAGMAJOR} \
+               -o ${LIBAFSSETPAG} -Wl,--version-script=${srcdir}/mapfile \
+               ${SHLIBOBJS} syscall.o ;; \
+       rs_aix4*) \
+           ${SHLIB_LINKER} -o ${LIBAFSSETPAG} ${SHLIBOBJS} syscall.o \
+               -bE:afssetpag.exp;; \
+       sun*_5*) \
+           ${SHLIB_LINKER} -h libafssetpag.so.${LIBAFSSETPAGMAJOR} \
+               -o ${LIBAFSSETPAG} ${SHLIBOBJS} syscall.o;; \
+       hp_ux11*) \
+           ${SHLIB_LINKER} -o ${LIBAFSSETPAG} ${SHLIBOBJS};; \
+       *) \
+           ${SHLIB_LINKER} -o ${LIBAFSSETPAG} ${SHLIBOBJS} syscall.o ;; \
+       esac
+
+${LIBAFSSETPAG_DARWIN}: ${SHLIBOBJS}
+       ${SHLIB_LINKER} -o ${LIBAFSSETPAG_DARWIN} ${ARCHFLAGS} -install_name ${libdir}/${LIBAFSSETPAG_DARWIN} -compatibility_version ${LIBAFSSETPAGMAJOR} -current_version ${LIBAFSSETPAGMAJOR}.${LIBAFSSETPAGMINOR} ${SHLIBOBJS}
+
 tests: pagsh pagsh.krb fixit iinc idec icreate iopen istat rmtsysd
 
 syscall.o: syscall.s
        @set -x; case "$(SYS_NAME)" in \
         sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53  | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5? | sun4x_5?? | sunx86_5? | sunx86_5?? ) \
-               /usr/ccs/lib/cpp -P ${SFLAGS} ${srcdir}/syscall.s syscall.ss; \
+               $(CPP) -P ${SFLAGS} ${srcdir}/syscall.s syscall.ss; \
                as -o syscall.o syscall.ss;             \
                $(RM) syscall.ss;;                              \
         sgi_* |*_darwin* ) \
@@ -63,7 +104,7 @@ syscall.o: syscall.s
                ${AS} syscall.S -o syscall.o ;  \
                $(RM) -f syscall.S ;;\
         *) \
-               /lib/cpp -P ${SFLAGS} ${srcdir}/syscall.s syscall.ss; \
+               $(CPP) -P ${SFLAGS} ${srcdir}/syscall.s syscall.ss; \
                as -o syscall.o syscall.ss;             \
                $(RM) syscall.ss;;                              \
        esac
@@ -106,6 +147,15 @@ rmtsys.xdr.c: rmtsys.xg
 rmtsys.h: rmtsys.xg
        ${RXGEN} -A -h -o $@ ${srcdir}/rmtsys.xg
 
+Krmtsys.cs.c: rmtsys.xg Krmtsys.h
+       ${RXGEN} -A -k -C -o Krmtsys.cs.c ${srcdir}/rmtsys.xg
+
+Krmtsys.xdr.c: rmtsys.xg
+       ${RXGEN} -A -k -c -o Krmtsys.xdr.c ${srcdir}/rmtsys.xg
+
+Krmtsys.h: rmtsys.xg
+       ${RXGEN} -A -k -h -o Krmtsys.h ${srcdir}/rmtsys.xg
+
 rmtsysd: rmtsysd.o libsys.a
        ${CC} ${CFLAGS} -o rmtsysd rmtsysd.o ${LIBS}
 
@@ -152,6 +202,17 @@ xfsinode: xfsinode.c  AFS_component_version_number.c
                $(CC) -o xfsinode ${CFLAGS} ${srcdir}/xfsinode.c ${LIBS}
        esac
 
+${TOP_LIBDIR}/${LIBAFSSETPAG}: ${LIBAFSSETPAG}
+       ${INSTALL} ${LIBAFSSETPAG} ${TOP_LIBDIR}/${LIBAFSSETPAG}
+       -ln -f -s ${LIBAFSSETPAG} ${TOP_LIBDIR}/libafssetpag.${SHLIB_SUFFIX}
+       -ln -f -s ${LIBAFSSETPAG} ${TOP_LIBDIR}/libafssetpag.${SHLIB_SUFFIX}.${LIBAFSSETPAGMAJOR}
+
+${TOP_LIBDIR}/${LIBAFSSETPAG_DARWIN}: ${LIBAFSSETPAG_DARWIN}
+       ${INSTALL} ${LIBAFSSETPAG_DARWIN} ${TOP_LIBDIR}/${LIBAFSSETPAG_DARWIN}
+       -ln -f -s ${LIBAFSSETPAG_DARWIN} ${TOP_LIBDIR}/libafssetpag.${SHLIB_SUFFIX}
+       -ln -f -s ${LIBAFSSETPAG_DARWIN} ${TOP_LIBDIR}/libafssetpag.${LIBAFSSETPAGMAJOR}.${LIBAFSSETPAGMINOR}.${SHLIB_SUFFIX}
+ 
+
 afs.exp: ${srcdir}/afs4.exp ${srcdir}/afs5.exp
        @set -x; case ${SYS_NAME} in \
                rs_aix5* ) \
@@ -179,6 +240,9 @@ afsl.exp: ${srcdir}/afsl4.exp ${srcdir}/afsl5.exp
 ${TOP_INCDIR}/afs/afssyscalls.h: afssyscalls.h
        ${INSTALL} $? $@
 
+${TOP_INCDIR}/afs/rmtsys.h: rmtsys.h
+       ${INSTALL} $? $@
+
 ${TOP_INCDIR}/afs/afs.exp: afs.exp
        @set -x; case ${SYS_NAME} in \
                rs_aix* ) \
@@ -214,10 +278,12 @@ ${KERNELDIR}/afs/xfsattrs.h: xfsattrs.h
 
 depinstall: \
        ${TOP_INCDIR}/afs/afssyscalls.h \
+       ${TOP_INCDIR}/afs/rmtsys.h \
        ${TOP_INCDIR}/afs/afs.exp \
        ${TOP_INCDIR}/afs/xfsattrs.h \
        ${KERNELDIR}/afs/xfsattrs.h \
-       ${UKERNELDIR}/afs/afsl.exp
+       ${UKERNELDIR}/afs/afsl.exp \
+       Krmtsys.cs.c Krmtsys.h Krmtsys.xdr.c rmtsys.h 
 
 install: \
     ${DESTDIR}${libdir}/afs/libsys.a \
@@ -227,10 +293,30 @@ install: \
     ${DESTDIR}${bindir}/pagsh.krb \
     ${DESTDIR}${includedir}/afs/afs.exp \
     ${DESTDIR}${includedir}/afs/xfsattrs.h
+       @set -x; case ${SYS_NAME} in \
+       *_darwin_*) \
+           ${MAKE} '${DESTDIR}${libdir}/${LIBAFSSETPAG_DARWIN}';; \
+       *) \
+           ${MAKE} '${DESTDIR}${libdir}/${LIBAFSSETPAG}';; \
+       esac
 
 ${DESTDIR}${libdir}/afs/libsys.a: libsys.a
        ${INSTALL} $? $@
 
+${DESTDIR}${libdir}/${LIBAFSSETPAG}: ${LIBAFSSETPAG}
+       ${INSTALL} ${LIBAFSSETPAG} ${DESTDIR}${libdir}/${LIBAFSSETPAG}
+       -ln -f -s ${LIBAFSSETPAG} \
+           ${DESTDIR}${libdir}/libafssetpag.${SHLIB_SUFFIX}
+       -ln -f -s ${LIBAFSSETPAG} \
+           ${DESTDIR}${libdir}/libafssetpag.${SHLIB_SUFFIX}.${LIBAFSSETPAGMAJOR}
+
+${DESTDIR}${libdir}/${LIBAFSSETPAG_DARWIN}: ${LIBAFSSETPAG_DARWIN}
+       ${INSTALL} ${LIBAFSSETPAG_DARWIN} ${DESTDIR}${libdir}/${LIBAFSSETPAG_DARWIN}
+       -ln -f -s ${LIBAFSSETPAG_DARWIN} \
+               ${DESTDIR}${libdir}/libafssetpag.${SHLIB_SUFFIX} ; \
+       -ln -f -s ${LIBAFSSETPAG_DARWIN} \
+               ${DESTDIR}${libdir}/libafssetpag.${LIBAFSSETPAGMAJOR}.${LIBAFSSETPAGMINOR}.${SHLIB_SUFFIX} ;; \
+
 ${DESTDIR}${sbindir}/rmtsysd: rmtsysd
        ${INSTALL} $? $@
 
@@ -260,6 +346,12 @@ dest: \
     ${DEST}/include/afs/afssyscalls.h \
     ${DEST}/include/afs/afs.exp \
     ${DEST}/include/afs/xfsattrs.h
+       @set -x; case ${SYS_NAME} in \
+       *_darwin_*) \
+           ${MAKE} '${TOP_LIBDIR}/${LIBAFSSETPAG_DARWIN}';; \
+       *) \
+           ${MAKE} '${TOP_LIBDIR}/${LIBAFSSETPAG}';; \
+       esac
 
 ${DEST}/lib/afs/libsys.a: libsys.a
        ${INSTALL} $? $@
@@ -294,5 +386,5 @@ clean:
        $(RM) -f *.o libsys.a xfsinode iinc idec icreate iopen istat core \
        rmtsysc rmtsyss *.o rmtsys.ss.c rmtsys.cs.c rmtsys.xdr.c rmtsys.h \
        rmtsysd AFS_component_version_number.c pagsh pagsh.krb \
-       afs.exp afsl.exp 
+       afs.exp afsl.exp libafssetpag.* Krmtsys.cs.c Krmtsys.h Krmtsys.xdr.c
        $(RM) -rf picobj