Fix build for separate objdirs

In particular, setting UNTHREADED=${srcdir}/dir and then referring
to ${srcdir}/${UNTHREADED} is a recipe for sadness.

Fix the libtool invocation to correctly find .la.sym files in ${srcdir}.

Also add some missing header dependencies that are hidden when building
in the src tree.

Change-Id: I1b663141c549cc4b90e46327c3fb31dc80294eaa
Reviewed-on: http://gerrit.openafs.org/8891
Reviewed-by: Marc Dionne <marc.c.dionne@gmail.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>

diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in
index 2576c6d..a4101c7 100644 (file)
--- a/src/config/Makefile.config.in
+++ b/src/config/Makefile.config.in
@@ -243,7 +243,7 @@ LT_LDLIB_shlib=$(LIBTOOL) --quiet --mode=link --tag=CC \
                $(PTH_LDFLAGS) $(PTH_CFLAGS) $(LDFLAGS_$(@)) \
                -o $@ \
                -no-undefined \
-               -export-symbols $@.sym \
+               -export-symbols ${srcdir}/$@.sym \
                -version-info=$(LT_current):$(LT_revision):$(LT_age)
 
 

diff --git a/src/tbudb/Makefile.in b/src/tbudb/Makefile.in
index 31bcf65..27bcb8e 100644 (file)
--- a/src/tbudb/Makefile.in
+++ b/src/tbudb/Makefile.in
@@ -52,7 +52,7 @@ budb_errs.h: budb_errs.c
 
 budb_errs.c: ${BUDB}/budb_errs.et
        $(RM) -f budb_errs.c
-       ${COMPILE_ET} -p ${srcdir}/${BUDB} budb_errs
+       ${COMPILE_ET} -p ${BUDB} budb_errs
 
 #
 # Build targets
@@ -96,16 +96,16 @@ budb_server: $(SERVER_OBJS) ${LIBS}
                $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 budb.cs.c: ${BUDB}/budb.rg
-       ${RXGEN} -u -C -o $@ ${srcdir}/${BUDB}/budb.rg
+       ${RXGEN} -u -C -o $@ ${BUDB}/budb.rg
 
 budb.ss.c: ${BUDB}/budb.rg
-       ${RXGEN} -S -o $@ ${srcdir}/${BUDB}/budb.rg
+       ${RXGEN} -S -o $@ ${BUDB}/budb.rg
 
 budb.xdr.c: ${BUDB}/budb.rg
-       ${RXGEN} -c -o $@ ${srcdir}/${BUDB}/budb.rg
+       ${RXGEN} -c -o $@ ${BUDB}/budb.rg
 
 budb.h: ${BUDB}/budb.rg
-       ${RXGEN} -u -h -o $@ ${srcdir}/${BUDB}/budb.rg
+       ${RXGEN} -u -h -o $@ ${BUDB}/budb.rg
 
 budb.cs.c: budb.h
 budb.xdr.c: budb.h

diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in
index 32c4fad..97910d3 100644 (file)
--- a/src/tptserver/Makefile.in
+++ b/src/tptserver/Makefile.in
@@ -45,6 +45,9 @@ LIBS_client= \
 all: ptserver pts pt_util db_verify \
        depinstall readgroup readpwd testpt
 
+generated: \
+       pterror.h pterror.c
+
 depinstall: 
 
 # When supergroups is enabled, some parts of ptserver cast between
@@ -59,7 +62,7 @@ CFLAGS_ptprocs.o = @CFLAGS_NOSTRICT@
 ptserver.o: ${PTSERVER}/ptserver.c ${INCLS}
        $(AFS_CCRULE) $(PTSERVER)/ptserver.c
 
-ptutils.o: ${PTSERVER}/ptutils.c ${INCLS}
+ptutils.o: ${PTSERVER}/ptutils.c ${INCLS} pterror.h
        $(AFS_CCRULE) $(PTSERVER)/ptutils.c
 
 ptprocs.o: ${PTSERVER}/ptprocs.c ${INCLS}
@@ -72,13 +75,13 @@ map.o: ${PTSERVER}/map.c ${INCLS}
        $(AFS_CCRULE) $(PTSERVER)/map.c
 
 ptint.ss.c: ${PTSERVER}/ptint.xg
-       ${RXGEN} -A -x -S -o $@ ${srcdir}/${PTSERVER}/ptint.xg
+       ${RXGEN} -A -x -S -o $@ ${PTSERVER}/ptint.xg
 
 ptint.xdr.c: ${PTSERVER}/ptint.xg
-       ${RXGEN} -A -x -c -o $@ ${srcdir}/${PTSERVER}/ptint.xg
+       ${RXGEN} -A -x -c -o $@ ${PTSERVER}/ptint.xg
 
 ptint.h: ${PTSERVER}/ptint.xg
-       ${RXGEN} -A -x -h -u -o $@ ${srcdir}/${PTSERVER}/ptint.xg
+       ${RXGEN} -A -x -h -u -o $@ ${PTSERVER}/ptint.xg
 
 ptint.ss.c: ptint.h
 ptint.xdr.c: ptint.h
@@ -143,6 +146,11 @@ pt_util.o: ${PTSERVER}/pt_util.c
 ubik.o: ${PTSERVER}/ubik.c ${INCLS}
        $(AFS_CCRULE) $(PTSERVER)/ubik.c
 
+pterror.h: pterror.c
+pterror.c: ${PTSERVER}/pterror.et
+       $(RM) -f pterror.h pterror.c
+       ${COMPILE_ET} -p ${PTSERVER} pterror
+
 prerror.h: pterror.h
        ${INSTALL} $? $@
        echo '#define ERROR_TABLE_BASE_pr ERROR_TABLE_BASE_PT' >> $@

diff --git a/src/tubik/Makefile.in b/src/tubik/Makefile.in
index 4a8caf1..ac95399 100644 (file)
--- a/src/tubik/Makefile.in
+++ b/src/tubik/Makefile.in
@@ -48,10 +48,10 @@ utst_int.cs.c: utst_int.h
 utst_int.ss.c: utst_int.h
 utst_int.xdr.c: utst_int.h
 
-utst_server.o: ${UBIK}/utst_server.c
+utst_server.o: ${UBIK}/utst_server.c utst_int.h
        ${AFS_CCRULE} ${UBIK}/utst_server.c
 
-utst_client.o: ${UBIK}/utst_client.c
+utst_client.o: ${UBIK}/utst_client.c utst_int.h
        ${AFS_CCRULE} ${UBIK}/utst_client.c
 
 utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o $(LTLIBS)

diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in
index 0dd82b6..5b81f5a 100644 (file)
--- a/src/tvlserver/Makefile.in
+++ b/src/tvlserver/Makefile.in
@@ -92,13 +92,13 @@ vldbint.xdr.o: vldbint.xdr.c
 
 
 vldbint.ss.c: ${VLSERVER}/vldbint.xg
-       ${RXGEN} -A -x -S -o $@ ${srcdir}/${VLSERVER}/vldbint.xg
+       ${RXGEN} -A -x -S -o $@ ${VLSERVER}/vldbint.xg
 
 vldbint.xdr.c: ${VLSERVER}/vldbint.xg
-       ${RXGEN} -A -x -c -o $@ ${srcdir}/${VLSERVER}/vldbint.xg
+       ${RXGEN} -A -x -c -o $@ ${VLSERVER}/vldbint.xg
 
 vldbint.h: ${VLSERVER}/vldbint.xg
-       ${RXGEN} -A -u -x -h -o $@ ${srcdir}/${VLSERVER}/vldbint.xg
+       ${RXGEN} -A -u -x -h -o $@ ${VLSERVER}/vldbint.xg
 
 vldbint.ss.c: vldbint.h
 vldbint.xdr.c: vldbint.h
@@ -113,7 +113,7 @@ vlclient.o: ${VLSERVER}/vlclient.c
 vl_errors.o: vl_errors.c
 
 vlserver.h vl_errors.c: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h
-       $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} -p ${srcdir}/${VLSERVER} vl_errors -h vlserver
+       $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} -p ${VLSERVER} vl_errors -h vlserver
 
 system: install