Move include of sys/types.h in kopenafs.c

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

diff --git a/src/kopenafs/Makefile.in b/src/kopenafs/Makefile.in
index 3f06c0e..35d6b74 100644 (file)
--- a/src/kopenafs/Makefile.in
+++ b/src/kopenafs/Makefile.in
@@ -9,6 +9,8 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+include @TOP_OBJDIR@/src/config/Makefile.shared
+
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -17,11 +19,9 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 # API version. When something changes, increment as appropriate. 
 # Ignore at your own risk.
 MAJOR          = 1
-MINOR          = 0
+MINOR          = 1
 
-CC             = ${MT_CC}
-INCLUDES       = -I. -I${srcdir} -I../sys
-CFLAGS         = ${COMMON_CFLAGS} ${INCLUDES} ${MT_CFLAGS} ${SHLIB_CFLAGS}
+MODULE_INCLUDE = -I. -I${srcdir} -I../sys
 
 SFLAGS         = -I${TOP_INCDIR}
 SYS            = ${srcdir}/../sys
@@ -41,23 +41,24 @@ ${TOP_LIBDIR}/libkopenafs.a: libkopenafs.a
        ${INSTALL_DATA} libkopenafs.a $@
 
 ${TOP_INCDIR}/kopenafs.h: kopenafs.h
-       ${INSTALL_DATA} kopenafs.h $@
+       ${INSTALL_DATA} $? $@
 
 glue.o: ${SYS}/glue.c ${SYS}/afssyscalls.h
-       ${CCOBJ} ${CFLAGS} -c ${SYS}/glue.c
+       $(AFS_CCRULE) $(SYS)/glue.c
 
 pioctl.o: ${SYS}/pioctl.c ${SYS}/afssyscalls.h
-       ${CCOBJ} ${CFLAGS} -c ${SYS}/pioctl.c
+       $(AFS_CCRULE) $(SYS)/pioctl.c
 
 setpag.o: ${SYS}/setpag.c ${SYS}/afssyscalls.h
-       ${CCOBJ} ${CFLAGS} -c ${SYS}/setpag.c
+       $(AFS_CCRULE) $(SYS)/setpag.c
 
 # This file is only actually used on SGI and AIX, but some systems can't cope
 # with an empty .o file being included in a link.
+
 syscall.o: ${SYS}/syscall.s
        @set -e; set -x; case "$(SYS_NAME)" in \
        sgi_*) \
-                ${CC} ${CFLAGS} -c ${SYS}/syscall.s; \
+                $(AFS_CCRULE) ${SYS}/syscall.s; \
                ;; \
        rs_aix* | hp_ux10*) \
                $(PATH_CPP) -P ${SFLAGS} ${SYS}/syscall.s > syscall.ss; \
@@ -79,7 +80,7 @@ libkopenafs.a: ${LIBOBJS} syscall.o
        esac
        ${RANLIB} $@
 
-${LIBKOPENAFS}: ${LIBOBJS} syscall.o
+${LIBKOPENAFS}: ${LIBOBJS} syscall.o libkopenafs.map
        @set -e; set -x; case ${SYS_NAME} in \
        sgi_* | rs_aix* | hp_ux10*) \
                ../config/shlib-build -d $(srcdir) -l libkopenafs \
@@ -94,10 +95,10 @@ ${LIBKOPENAFS}: ${LIBOBJS} syscall.o
        esac
 
 test-unlog: test-unlog.o libkopenafs.a
-       ${CC} -o test-unlog test-unlog.o libkopenafs.a ${XLIBS} ${CFLAGS}
+       $(AFS_LDRULE) test-unlog.o libkopenafs.a ${XLIBS}
 
 test-setpag: test-setpag.o libkopenafs.a
-       ${CC} -o test-setpag test-setpag.o libkopenafs.a ${XLIBS} ${CFLAGS}
+       $(AFS_LDRULE) test-setpag.o libkopenafs.a ${XLIBS}
 
 #
 # Installation targets
@@ -106,7 +107,7 @@ install: ${LIBKOPENAFS}
        ${INSTALL} -d ${DESTDIR}${libdir}
        ${INSTALL} -d ${DESTDIR}${includedir}
        ${INSTALL_DATA} libkopenafs.a ${DESTDIR}${libdir}/libkopenafs.a
-       ${INSTALL_DATA} kopenafs.h ${DESTDIR}${includedir}/kopenafs.h
+       ${INSTALL_DATA} ${srcdir}/kopenafs.h ${DESTDIR}${includedir}/kopenafs.h
        ../config/shlib-install -d ${DESTDIR}${libdir} \
                -l libkopenafs -M ${MAJOR} -m ${MINOR}
 
@@ -114,7 +115,7 @@ dest: ${LIBKOPENAFS}
        ${INSTALL} -d ${DEST}/lib
        ${INSTALL} -d ${DEST}/include
        ${INSTALL_DATA} libkopenafs.a ${DEST}/lib/libkopenafs.a
-       ${INSTALL_DATA} kopenafs.h ${DEST}/include/kopenafs.h
+       ${INSTALL_DATA} ${srcdir}/kopenafs.h ${DEST}/include/kopenafs.h
        ../config/shlib-install -d ${DEST}/lib \
                -l libkopenafs -M ${MAJOR} -m ${MINOR}
 
@@ -123,6 +124,6 @@ dest: ${LIBKOPENAFS}
 #
 clean:
        $(RM) -f *.o *.a ${LIBKOPENAFS} AFS_component_version_number.c \
-               test-setpag test-unlog
+               test-setpag test-unlog libkopenafs.exp
 
 include ../config/Makefile.version