libuafs: only rebuild h directory when needed

[openafs.git] / src / libuafs / Makefile.common.in

diff --git a/src/libuafs/Makefile.common.in b/src/libuafs/Makefile.common.in
index 5779c54..4bf9d77 100644 (file)
--- a/src/libuafs/Makefile.common.in
+++ b/src/libuafs/Makefile.common.in
@@ -101,7 +101,7 @@ linktest: UAFS/$(LIBUAFS)
                $(LDFLAGS_roken) $(LDFLAGS_hcrypto) -o linktest \
                ${srcdir}/linktest.c $(COMMON_INCLUDE) -DUKERNEL \
                UAFS/$(LIBUAFS) ${TOP_LIBDIR}/libcmd.a \
-               ${TOP_LIBDIR}/libafsutil.a \
+               ${TOP_LIBDIR}/libafsutil.a $(TOP_LIBDIR)/libopr.a \
                $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) $(TEST_LIBS) $(XLIBS)
 
 CRULE1=        $(CC) $(COMMON_INCLUDE) $(CPPFLAGS_roken) $(OPTF) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) -c $?
@@ -201,6 +201,8 @@ UAFSOBJ = \
        $(UOBJ)/rx_stats.o \
        $(UOBJ)/rx_packet.o \
        $(UOBJ)/rx_conncache.o \
+       $(UOBJ)/rx_call.o \
+       $(UOBJ)/rx_conn.o \
        $(UOBJ)/xdr_rx.o \
        $(UOBJ)/Kvldbint.cs.o \
        $(UOBJ)/Kvldbint.xdr.o \
@@ -346,6 +348,8 @@ PICUAFSOBJ = \
        $(PICOBJ)/rx_stats.o \
        $(PICOBJ)/rx_packet.o \
        $(PICOBJ)/rx_conncache.o \
+       $(PICOBJ)/rx_call.o \
+       $(PICOBJ)/rx_conn.o \
        $(PICOBJ)/xdr_rx.o \
        $(PICOBJ)/Kvldbint.cs.o \
        $(PICOBJ)/Kvldbint.xdr.o \
@@ -491,6 +495,8 @@ AFSWEBOBJ = \
        $(WEBOBJ)/rx_stats.o \
        $(WEBOBJ)/rx_packet.o \
        $(WEBOBJ)/rx_conncache.o \
+       $(WEBOBJ)/rx_call.o \
+       $(WEBOBJ)/rx_conn.o \
        $(WEBOBJ)/xdr_rx.o \
        $(WEBOBJ)/Kvldbint.cs.o \
        $(WEBOBJ)/Kvldbint.xdr.o \
@@ -630,6 +636,8 @@ AFSWEBOBJKRB = \
        $(WEBOBJ)/rx_stats.o \
        $(WEBOBJ)/rx_packet.o \
        $(WEBOBJ)/rx_conncache.o \
+       $(WEBOBJ)/rx_call.o \
+       $(WEBOBJ)/rx_conn.o \
        $(WEBOBJ)/xdr_rx.o \
        $(WEBOBJ)/Kvldbint.cs.o \
        $(WEBOBJ)/Kvldbint.xdr.o \
@@ -773,6 +781,8 @@ JUAFSOBJ = \
        $(JUAFS)/rx_stats.o \
        $(JUAFS)/rx_packet.o \
        $(JUAFS)/rx_conncache.o \
+       $(JUAFS)/rx_call.o \
+       $(JUAFS)/rx_conn.o \
        $(JUAFS)/xdr_rx.o \
        $(JUAFS)/Kvldbint.cs.o \
        $(JUAFS)/Kvldbint.xdr.o \
@@ -974,6 +984,10 @@ $(UOBJ)/rx_packet.o: $(TOP_SRC_RX)/rx_packet.c
        $(CRULE1)
 $(UOBJ)/rx_conncache.o: $(TOP_SRCDIR)/rx/rx_conncache.c
        $(CRULE1)
+$(UOBJ)/rx_call.o: $(TOP_SRCDIR)/rx/rx_call.c
+       $(CRULE1)
+$(UOBJ)/rx_conn.o: $(TOP_SRCDIR)/rx/rx_conn.c
+       $(CRULE1)
 $(UOBJ)/xdr_rx.o: $(TOP_SRC_RX)/xdr_rx.c
        $(CRULE1)
 $(UOBJ)/xdr_int32.o: $(TOP_SRC_RX)/xdr_int32.c
@@ -988,7 +1002,7 @@ $(UOBJ)/afsd_uafs.o: $(TOP_SRC_AFS)/UKERNEL/afsd_uafs.c
        $(CRULE1)
 $(UOBJ)/afs_uuid.o: $(TOP_SRCDIR)/util/uuid.c
        $(CRULE1) -o afs_uuid.o
-$(UOBJ)/assert.o: $(TOP_SRCDIR)/util/assert.c
+$(UOBJ)/assert.o: $(TOP_SRCDIR)/opr/assert.c
        $(CRULE1)
 $(UOBJ)/xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c
        $(CRULE1)
@@ -1082,7 +1096,7 @@ $(UOBJ)/cellconfig.o: $(TOP_SRCDIR)/auth/cellconfig.c
        $(CRULE1)
 $(UOBJ)/keys.o: $(TOP_SRCDIR)/auth/keys.c
        $(CRULE1)
-$(UOBJ)/casestrcpy.o: $(TOP_SRCDIR)/util/casestrcpy.c
+$(UOBJ)/casestrcpy.o: $(TOP_SRCDIR)/opr/casestrcpy.c
        $(CRULE1)
 $(UOBJ)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c
        $(CRULE1)
@@ -1271,6 +1285,10 @@ $(PICOBJ)/rx_packet.o: $(TOP_SRC_RX)/rx_packet.c
        $(CRULEPIC)
 $(PICOBJ)/rx_conncache.o: $(TOP_SRCDIR)/rx/rx_conncache.c
        $(CRULEPIC)
+$(PICOBJ)/rx_call.o: $(TOP_SRCDIR)/rx/rx_call.c
+       $(CRULEPIC)
+$(PICOBJ)/rx_conn.o: $(TOP_SRCDIR)/rx/rx_conn.c
+       $(CRULEPIC)
 $(PICOBJ)/xdr_rx.o: $(TOP_SRC_RX)/xdr_rx.c
        $(CRULEPIC)
 $(PICOBJ)/xdr_int32.o: $(TOP_SRC_RX)/xdr_int32.c
@@ -1285,7 +1303,7 @@ $(PICOBJ)/afsd_uafs.o: $(TOP_SRC_AFS)/UKERNEL/afsd_uafs.c
        $(CRULEPIC)
 $(PICOBJ)/afs_uuid.o: $(TOP_SRCDIR)/util/uuid.c
        $(CRULEPIC) -o afs_uuid.o
-$(PICOBJ)/assert.o: $(TOP_SRCDIR)/util/assert.c
+$(PICOBJ)/assert.o: $(TOP_SRCDIR)/opr/assert.c
        $(CRULEPIC)
 $(PICOBJ)/xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c
        $(CRULEPIC)
@@ -1379,7 +1397,7 @@ $(PICOBJ)/cellconfig.o: $(TOP_SRCDIR)/auth/cellconfig.c
        $(CRULEPIC)
 $(PICOBJ)/keys.o: $(TOP_SRCDIR)/auth/keys.c
        $(CRULEPIC)
-$(PICOBJ)/casestrcpy.o: $(TOP_SRCDIR)/util/casestrcpy.c
+$(PICOBJ)/casestrcpy.o: $(TOP_SRCDIR)/opr/casestrcpy.c
        $(CRULEPIC)
 $(PICOBJ)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c
        $(CRULEPIC)
@@ -1570,6 +1588,10 @@ $(WEBOBJ)/rx_packet.o: $(TOP_SRC_RX)/rx_packet.c
        $(CRULE2)
 $(WEBOBJ)/rx_conncache.o: $(TOP_SRCDIR)/rx/rx_conncache.c
        $(CRULE2)
+$(WEBOBJ)/rx_call.o: $(TOP_SRCDIR)/rx_rx_call.c
+       $(CRULE2)
+$(WEBOBJ)/rx_conn.o: $(TOP_SRCDIR)/rx/rx_conn.c
+       $(CRULE2)
 $(WEBOBJ)/xdr_rx.o: $(TOP_SRC_RX)/xdr_rx.c
        $(CRULE2)
 $(WEBOBJ)/afs_usrops.o: $(TOP_SRC_AFS)/UKERNEL/afs_usrops.c
@@ -1580,7 +1602,7 @@ $(WEBOBJ)/afsd_uafs.o: $(TOP_SRC_AFS)/UKERNEL/afsd_uafs.c
        $(CRULE2)
 $(WEBOBJ)/afs_uuid.o: $(TOP_SRCDIR)/util/uuid.c
        $(CRULE2) -o afs_uuid.o
-$(WEBOBJ)/assert.o: $(TOP_SRCDIR)/util/assert.c
+$(WEBOBJ)/assert.o: $(TOP_SRCDIR)/opr/assert.c
        $(CRULE1)
 $(WEBOBJ)/xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c
        $(CRULE2)
@@ -1685,7 +1707,7 @@ $(WEBOBJ)/cellconfig.o: $(TOP_SRCDIR)/auth/cellconfig.c
        $(CRULE2)
 $(WEBOBJ)/keys.o: $(TOP_SRCDIR)/auth/keys.c
        $(CRULE2)
-$(WEBOBJ)/casestrcpy.o: $(TOP_SRCDIR)/util/casestrcpy.c
+$(WEBOBJ)/casestrcpy.o: $(TOP_SRCDIR)/opr/casestrcpy.c
        $(CRULE1)
 $(WEBOBJ)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c
        $(CRULE1)
@@ -1873,6 +1895,10 @@ $(JUAFS)/rx_packet.o: $(TOP_SRC_RX)/rx_packet.c
        $(CRULE1)
 $(JUAFS)/rx_conncache.o: $(TOP_SRCDIR)/rx/rx_conncache.c
        $(CRULE1)
+$(JUAFS)/rx_call.o: $(TOP_SRC_RX)/rx_call.c
+       $(CRULE1)
+$(JUAFS)/rx_conn.o: $(TOP_SRC_RX)/rx_conn.c
+       $(CRULE1)
 $(JUAFS)/xdr_rx.o: $(TOP_SRC_RX)/xdr_rx.c
        $(CRULE1)
 $(JUAFS)/xdr_int64.o: $(TOP_SRC_RX)/xdr_int64.c
@@ -1885,7 +1911,7 @@ $(JUAFS)/afsd_uafs.o: $(TOP_SRC_AFS)/UKERNEL/afsd_uafs.c
        $(CRULE1)
 $(JUAFS)/afs_uuid.o: $(TOP_SRCDIR)/util/uuid.c
        $(CRULE1) -o afs_uuid.o
-$(JUAFS)/assert.o: $(TOP_SRCDIR)/util/assert.c
+$(JUAFS)/assert.o: $(TOP_SRCDIR)/opr/assert.c
        $(CRULE1)
 $(JUAFS)/xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c
        $(CRULE1)
@@ -1977,7 +2003,7 @@ $(JUAFS)/cellconfig.o: $(TOP_SRCDIR)/auth/cellconfig.c
        $(CRULE1)
 $(JUAFS)/keys.o: $(TOP_SRCDIR)/auth/keys.c
        $(CRULE1)
-$(JUAFS)/casestrcpy.o: $(TOP_SRCDIR)/util/casestrcpy.c
+$(JUAFS)/casestrcpy.o: $(TOP_SRCDIR)/opr/casestrcpy.c
        $(CRULE1)
 $(JUAFS)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c
        $(CRULE1)
@@ -2033,14 +2059,16 @@ $(PERLUAFS)/ukernel.so: $(PERLUAFS)/ukernel_swig_perl.o UAFS.pic/libuafs_pic.a
                $(SWIG_PERL_LDFLAGS) $(LDFLAGS) \
                $(PERLUAFS)/ukernel_swig_perl.o \
                UAFS.pic/libuafs_pic.a ${TOP_LIBDIR}/libcmd_pic.a \
-               ${TOP_LIBDIR}/libafsutil_pic.a $(LDFLAGS_roken) \
-               $(LDFLAGS_hcrypto) $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) \
+               ${TOP_LIBDIR}/libafsutil_pic.a \
+               $(TOP_LIBDIR)/libopr.a \
+               $(LDFLAGS_roken) $(LDFLAGS_hcrypto) $(LIB_hcrypto) \
+               $(LIB_roken) $(LIB_crypt) \
                $(XLIBS)
 
 clean:
        -$(RM) -rf UAFS* JUAFS* AFSWEB* PERLUAFS nsapi afsd afs afsint config rx
-       -$(RM) -f  h net netinet rpc ufs machine inet nfs sys linktest $(AFS_OS_CLEAN)
-
+       -$(RM) -rf h
+       -$(RM) -f linktest $(AFS_OS_CLEAN)
 
 install: UAFS/$(LIBUAFS) JUAFS/$(LIBJUAFS) UAFS.pic/libuafs_pic.a \
                @LIBUAFS_BUILD_PERL@
@@ -2072,7 +2100,7 @@ dest: $(TOP_INCDIR)/afs/param.h $(TOP_INCDIR)/afs/stds.h \
                ${DEST}/root.perf/include/afs/afs_sysnames.h
        ${INSTALL_DATA} $(TOP_INCDIR)/afs/afs_stats.h \
                ${DEST}/root.perf/include/afs/afs_stats.h
-       ${INSTALL_DATA} $(TOP_SRCDIR)/afs/sysincludes.h \
+       ${INSTALL_DATA} $(TOP_SRCDIR)/afs/UKERNEL/sysincludes.h \
                ${DEST}/root.perf/include/afs/sysincludes.h
        ${INSTALL_DATA} $(TOP_SRCDIR)/afs/UKERNEL/afs_usrops.h \
                ${DEST}/root.perf/include/afs/afs_usrops.h
@@ -2101,16 +2129,13 @@ JUAFS:
 AFSWEB:
        mkdir -p $@
 
-setup_common:
-       -$(RM) -f h net netinet rpc ufs nfs machine sys inet nsapi afsd
-       -ln -s ${ISYSROOT}/usr/include/sys h
-       -ln -s ${ISYSROOT}/usr/include/net net
-       -ln -s ${ISYSROOT}/usr/include/netinet netinet
-       -ln -s ${ISYSROOT}/usr/include/rpc rpc
-       -ln -s ${ISYSROOT}/usr/include/sys sys
-       -ln -s ${ISYSROOT}/usr/include/nfs nfs
-       -ln -s ${ISYSROOT}/usr/include/inet inet
-       -ln -s ${ISYSROOT}/usr/include/ufs ufs
+h: $(TOP_SRC_AFS)/*.c $(TOP_SRC_VNOPS)/*.c $(TOP_SRC_RX)/*.c
+       -$(RM) -rf h
+       @TOP_SRCDIR@/libuafs/make_h_tree.pl $(TOP_SRC_AFS) $(TOP_SRC_VNOPS) \
+               $(TOP_SRC_RX)
+
+setup_common: h
+       -$(RM) -f nsapi afsd
        -ln -s $(TOP_SRCDIR)/afsd afsd
        -ln -s $(NS_INCL) nsapi
 
@@ -2146,7 +2171,7 @@ UAFS.pic/libuafs_pic.a: setup_picuafs
 
 JUAFS/$(LIBJUAFS): setup_juafs
        cd JUAFS && \
-       $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS && \
+       $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=&& \
        $(RANLIB) $(LIBJUAFS)
 
 AFSWEB/$(LIBAFSWEB): setup_nsafs