DEVEL15-cpp-fixes-20080630

[openafs.git] / src / sys / Makefile.in

diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in
index e7c2efd..12b7206 100644 (file)
--- a/src/sys/Makefile.in
+++ b/src/sys/Makefile.in
@@ -19,8 +19,8 @@ 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}
@@ -46,30 +46,38 @@ all: \
            ${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}
+${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};; \
+               ${SHLIBOBJS} syscall.o ;; \
        rs_aix4*) \
-           ${SHLIB_LINKER} -o ${LIBAFSSETPAG} ${SHLIBOBJS} \
+           ${SHLIB_LINKER} -o ${LIBAFSSETPAG} ${SHLIBOBJS} syscall.o \
                -bE:afssetpag.exp;; \
        sun*_5*) \
            ${SHLIB_LINKER} -h libafssetpag.so.${LIBAFSSETPAGMAJOR} \
-               -o ${LIBAFSSETPAG} ${SHLIBOBJS};; \
-       *) \
+               -o ${LIBAFSSETPAG} ${SHLIBOBJS} syscall.o;; \
+       hp_ux11*) \
            ${SHLIB_LINKER} -o ${LIBAFSSETPAG} ${SHLIBOBJS};; \
+       *) \
+           ${SHLIB_LINKER} -o ${LIBAFSSETPAG} ${SHLIBOBJS} syscall.o ;; \
        esac
 
 ${LIBAFSSETPAG_DARWIN}: ${SHLIBOBJS}
@@ -80,7 +88,7 @@ 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?? ) \
-               $(CPP) -P ${SFLAGS} ${srcdir}/syscall.s syscall.ss; \
+               $(PATH_CPP) -P ${SFLAGS} ${srcdir}/syscall.s > syscall.ss; \
                as -o syscall.o syscall.ss;             \
                $(RM) syscall.ss;;                              \
         sgi_* |*_darwin* ) \
@@ -96,7 +104,7 @@ syscall.o: syscall.s
                ${AS} syscall.S -o syscall.o ;  \
                $(RM) -f syscall.S ;;\
         *) \
-               $(CPP) -P ${SFLAGS} ${srcdir}/syscall.s syscall.ss; \
+               $(PATH_CPP) -P ${SFLAGS} ${srcdir}/syscall.s > syscall.ss; \
                as -o syscall.o syscall.ss;             \
                $(RM) syscall.ss;;                              \
        esac
@@ -310,16 +318,16 @@ ${DESTDIR}${libdir}/${LIBAFSSETPAG_DARWIN}: ${LIBAFSSETPAG_DARWIN}
                ${DESTDIR}${libdir}/libafssetpag.${LIBAFSSETPAGMAJOR}.${LIBAFSSETPAGMINOR}.${SHLIB_SUFFIX} ;; \
 
 ${DESTDIR}${sbindir}/rmtsysd: rmtsysd
-       ${INSTALL} -s $? $@
+       ${INSTALL} $? $@
 
 ${DESTDIR}${includedir}/afs/afssyscalls.h: afssyscalls.h
        ${INSTALL} $? $@
 
 ${DESTDIR}${bindir}/pagsh: pagsh
-       ${INSTALL} -s $? $@
+       ${INSTALL} $? $@
 
 ${DESTDIR}${bindir}/pagsh.krb: pagsh.krb
-       ${INSTALL} -s $? $@
+       ${INSTALL} ${NO_STRIP_KRB} $? $@
 
 ${DESTDIR}${includedir}/afs/afs.exp: afs.exp
        @set -x; case ${SYS_NAME} in \
@@ -361,13 +369,13 @@ ${DEST}/include/afs/afssyscalls.h: afssyscalls.h
        ${INSTALL} $? $@
 
 ${DEST}/etc/rmtsysd: rmtsysd
-       ${INSTALL} -s $? $@
+       ${INSTALL} $? $@
 
 ${DEST}/bin/pagsh: pagsh
-       ${INSTALL} -s $? $@
+       ${INSTALL} $? $@
 
 ${DEST}/bin/pagsh.krb: pagsh.krb
-       ${INSTALL} -s $? $@
+       ${INSTALL} ${NO_STRIP_KRB} $? $@
 
 #
 # Misc targets