Eliminate $< outside of pattern rules

The $< variable in makefiles is not portable when used outside of
pattern rules. Replace each usage with the actual name of the file we
want.

Change-Id: Idc9309e7d7bd3b1bd93e8225507b8b53c9433d69
Reviewed-on: http://gerrit.openafs.org/2523
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in
index 6bbfe41c06ca34ae51a79355cd00a546f0729984..9d9d317e9269119b22b74a487d20db13700de1e3 100644 (file)
--- a/src/afsd/Makefile.in
+++ b/src/afsd/Makefile.in
@@ -43,13 +43,13 @@ vsys: vsys.o
 # Objects
 #
 afsd.o: afsd.c AFS_component_version_number.c
-       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c $<
+       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c ${srcdir}/afsd.c
 
 afsd_kernel.o: afsd_kernel.c
-       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c $<
+       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c ${srcdir}/afsd_kernel.c
 
 afsd_fuse.o: afsd_fuse.c AFS_component_version_number.c
-       $(CC) $(UAFS_CFLAGS) -c $<
+       $(CC) $(UAFS_CFLAGS) -c ${srcdir}/afsd_fuse.c
 
 vsys.o: vsys.c AFS_component_version_number.c
 

diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in
index 630e406e91c1653b215045edb9db479e511b9203..c386254bf5e47e651d044d9c8db412fe41d63612 100644 (file)
--- a/src/bozo/Makefile.in
+++ b/src/bozo/Makefile.in
@@ -93,13 +93,13 @@ bnode.o: bnode.c ${INCLS}
 bosoprocs.o: bosoprocs.c ${INCLS}
 
 bos.o: bos.c ${INCLS} AFS_component_version_number.o
-       $(CC) $(CFLAGS) -c $<
+       $(CC) $(CFLAGS) -c ${srcdir}/bos.c
 
 bos: bos.o $(LIBS) libbos.a
        ${CC} ${CFLAGS} -o bos bos.o libbos.a $(LIBS)  ${XLIBS}
 
 bos_util.o: bos_util.c ${INCLS} AFS_component_version_number.o ${TOP_INCDIR}/afs/bnode.h
-       $(CC) $(CFLAGS) -c $<
+       $(CC) $(CFLAGS) -c ${srcdir}/bos_util.c
 
 bos_util: bos_util.o $(LIBS) 
        ${CC} ${CFLAGS} -o bos_util bos_util.o $(LIBS)  ${XLIBS}

diff --git a/src/bucoord/Makefile.in b/src/bucoord/Makefile.in
index d0a507e8594c73855f3d5ec1c66786d8fb1a34ed..375aacaaead4e01d3368a2c8e42fdba0f819e4a7 100644 (file)
--- a/src/bucoord/Makefile.in
+++ b/src/bucoord/Makefile.in
@@ -77,16 +77,16 @@ bucoord_errs.c bc.h:        bucoord_errs.et bc.p.h
 # Errors
 #
 ubik_db_if.o: ubik_db_if.c
-       $(CC) $(CFLAGS) -c $<
+       $(CC) $(CFLAGS) -c ${srcdir}/ubik_db_if.c
 
 volstub.o: volstub.c
-       $(CC) $(CFLAGS) -c $<
+       $(CC) $(CFLAGS) -c ${srcdir}/volstub.c
 
 commands.o: commands.c
-       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c $<
+       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c ${srcdir}/commands.c
 
 regex.o: regex.c
-       $(CC) $(CFLAGS) -c $<
+       $(CC) $(CFLAGS) -c ${srcdir}/regex.c
 
 #
 # Install targets

diff --git a/src/butc/Makefile.in b/src/butc/Makefile.in
index 09eb942fbfd680e9adcddc925a29c4c9c15f3b1b..9bd050de0adb6e48c7e7348ae724b59366bef048 100644 (file)
--- a/src/butc/Makefile.in
+++ b/src/butc/Makefile.in
@@ -68,18 +68,19 @@ butc: ${SOBJS} ${LIBS} ${INCLS} ${HACKS}
        esac
 
 tcmain.o: tcmain.c ${INCLS} AFS_component_version_number.c
-       $(CC) $(CFLAGS) -c $<
+       $(CC) $(CFLAGS) -c ${srcdir}/tcmain.c
+
 dbentries.o: dbentries.c ${INCLS}
 tcprocs.o: tcprocs.c ${INCLS}
 test.o: test.c ${INCLS} AFS_component_version_number.c
 lwps.o: lwps.c ${INCLS}
-       $(CC) $(CFLAGS) -c $<
+       $(CC) $(CFLAGS) -c ${srcdir}/lwps.c
 list.o: list.c ${INCLS}
 recoverDb.o: recoverDb.c ${INCLS}
 tcudbprocs.o: tcudbprocs.c ${INCLS}
-       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c $<
+       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c ${srcdir}/tcudbprocs.c
 dump.o: dump.c ${INCLS}
-       $(CC) $(CFLAGS) -c $<
+       $(CC) $(CFLAGS) -c ${srcdir}/dump.c
 tcstatus.o: tcstatus.c ${INCLS}
 
 read_tape: read_tape.c

diff --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in
index 7dc6341c7df4f8d9094c96e6ea44ee9727f816f8..806332d8184b67d7b96f6d4ebfd2aeeae6590ea9 100644 (file)
--- a/src/comerr/Makefile.in
+++ b/src/comerr/Makefile.in
@@ -49,7 +49,7 @@ libcom_err.a: error_msg.o et_name.o com_err.o AFS_component_version_number.o
 # so we need to add the source directory to the includes to pick up local headers.
 #
 error_table.o: error_table.c
-       $(CC) $(CFLAGS) -I${srcdir} @CFLAGS_NOUNUSED@ -c $<
+       $(CC) $(CFLAGS) -I${srcdir} @CFLAGS_NOUNUSED@ -c error_table.c
 
 #
 # Installation targets

diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in
index f372b145a3fd36f097de6eb3ed4d764ae5bcf79a..4887bb185e0fffda7231bff164ed2d6f47a8451d 100644 (file)
--- a/src/kauth/Makefile.in
+++ b/src/kauth/Makefile.in
@@ -101,7 +101,7 @@ kadatabase.o: kadatabase.c ${INCLS}
        ${CC} ${CFLAGS} -c ${srcdir}/kadatabase.c 
 
 kaprocs.o: kaprocs.c ${INCLS} kaport.h
-       ${CC} ${CFLAGS} -c $<
+       ${CC} ${CFLAGS} -c ${srcdir}/kaprocs.c
 
 authclient.o: authclient.c ${INCLS}
 
@@ -164,10 +164,10 @@ token.o: token.c ${INCLS}
 client.o: client.c ${INCLS} AFS_component_version_number.o
 
 kas.o: kas.c ${INCLS} AFS_component_version_number.o
-       $(CC) $(CFLAGS) -c $<
+       $(CC) $(CFLAGS) -c ${srcdir}/kas.c
 
 admin_tools.o: admin_tools.c ${INCLS} kaport.h
-       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c $<
+       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c ${srcdir}/admin_tools.c
 
 kkids.o: kkids.c ${INCLS}
 
@@ -224,7 +224,7 @@ kdb: kdb.o ${INCLS} ${LIBS} libkauth.a
 kdb.o: kdb.c AFS_component_version_number.o
 
 krb_udp.o: krb_udp.c kaserver.h kautils.h kauth.h prot.h ${TOP_INCDIR}/lwp.h AFS_component_version_number.o
-       $(CC) $(CFLAGS) -c $<
+       $(CC) $(CFLAGS) -c ${srcdir}/krb_udp.c
 
 krb_udp: krb_udp.o libkauth.a $(KLIBS)
        ${CC} ${LDFLAGS} -o krb_udp krb_udp.o libkauth.a $(KLIBS)

diff --git a/src/libadmin/bos/Makefile.in b/src/libadmin/bos/Makefile.in
index 4d8298a93bbe7fb1fef77883b774a36c153c577b..e2e3336fc1d31d7b4e098a71a982de7ea16990f2 100644 (file)
--- a/src/libadmin/bos/Makefile.in
+++ b/src/libadmin/bos/Makefile.in
@@ -50,7 +50,7 @@ libbosadmin.a: ${LIBOBJS}
        ${RANLIB} $@
 
 afs_bosAdmin.o: afs_bosAdmin.c afs_bosAdmin.h
-       $(CC) $(CFLAGS) -c $<
+       $(CC) $(CFLAGS) -c ${srcdir}/afs_bosAdmin.c
 
 bosint.xdr.o: ${BOZO}/bosint.xdr.c
        ${CCRULE}

diff --git a/src/libadmin/kas/Makefile.in b/src/libadmin/kas/Makefile.in
index 716b0995daa14e01cb6e9554aa7321e326861ecb..b1478e8b17b29553e8e35e5a00e8ed854e04a6e6 100644 (file)
--- a/src/libadmin/kas/Makefile.in
+++ b/src/libadmin/kas/Makefile.in
@@ -53,7 +53,7 @@ libkasadmin.a: ${LIBOBJS}
        ${RANLIB} $@
 
 afs_kasAdmin.o: afs_kasAdmin.c afs_kasAdmin.h
-       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c $<
+       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c ${srcdir}/afs_kasAdmin.c
 
 kauth.cs.o: ../../kauth/kauth.cs.c
        ${CCRULE}

diff --git a/src/libadmin/samples/Makefile.in b/src/libadmin/samples/Makefile.in
index 00803a7ebc73773325ee0b308edb7d289e86cad0..44b9a7de5604ddbd47af3cd97edca2cd8269404b 100644 (file)
--- a/src/libadmin/samples/Makefile.in
+++ b/src/libadmin/samples/Makefile.in
@@ -116,10 +116,10 @@ rxstat_query_process: rxstat_query_process.o $(SAMPLELIBS)
 # Errors
 #
 rxstat_query_peer.o: rxstat_query_peer.c
-       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c $<
+       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c ${srcdir}/rxstat_query_peer.c
 
 rxstat_query_process.o: rxstat_query_process.c
-       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c $<
+       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c ${srcdir}/rxstat_query_process.c
 
 #######################################################################
 install:

diff --git a/src/libadmin/test/Makefile.in b/src/libadmin/test/Makefile.in
index f095aa34eb08ac3bce26403cc76a86b6507e861d..5d671b9b3812db8b450f9b290262ebb33a9c8ead 100644 (file)
--- a/src/libadmin/test/Makefile.in
+++ b/src/libadmin/test/Makefile.in
@@ -41,7 +41,7 @@ AFSCPOBJS =\
 all test tests: afscp
 
 client.o: client.c
-       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c $<
+       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c ${srcdir}/client.c
 
 afscp: afscp.o $(AFSCPOBJS) $(AFSCPLIBS)
        $(CC) $(CFLAGS) -o afscp afscp.o $(AFSCPOBJS) \

diff --git a/src/mcas/Makefile.mcas b/src/mcas/Makefile.mcas
index 8aa23fa1e942f688018695b508b1b715e7dad0ad..c6f64bb7e7035c25d171fd4c9ae12ceddd5a5d9b 100644 (file)
--- a/src/mcas/Makefile.mcas
+++ b/src/mcas/Makefile.mcas
@@ -66,15 +66,15 @@ replay: %: %.c $(COMMON_DEPS)
        $(CC) -o $@ $(patsubst %.c,%.o,$<) $(LDFLAGS)
 
 tree_mcas.o: tree_mcas.c mcas.c $(COMMON_DEPS)
-       $(CC) $(CFLAGS) -c -o $@ $<
+       $(CC) $(CFLAGS) -c ${srcdir}/tree_mcas.c
 skip_lock_perpointer.o: skip_lock.c $(COMMON_DEPS)
-       $(CC) $(CFLAGS) -DTINY_MTX -c -o $@ $<
+       $(CC) $(CFLAGS) -DTINY_MTX -c -o skip_lock_perpointer.o ${srcdir}/skip_lock.c
 skip_lock_pernode.o: skip_lock.c $(COMMON_DEPS)
-       $(CC) $(CFLAGS) -c -o $@ $<
+       $(CC) $(CFLAGS) -c -o skip_lock_pernode.o ${srcdir}/skip_lock.c
 skip_lock_perlist.o: skip_lock.c $(COMMON_DEPS)
-       $(CC) $(CFLAGS) -DFAT_MTX -c -o $@ $<
+       $(CC) $(CFLAGS) -DFAT_MTX -c -o skip_lock_perlist.o ${srcdir}/skip_lock.c
 skip_mcas.o: skip_mcas.c mcas.c $(COMMON_DEPS)
-       $(CC) $(CFLAGS) -c -o $@ $<
+       $(CC) $(CFLAGS) -c ${srcdir}/skip_mcas.c
 
 %.o: %.c $(COMMON_DEPS)
        $(CC) $(CFLAGS) -c -o $@ $<

diff --git a/src/mcas/Makefile.unit b/src/mcas/Makefile.unit
index 0cadcdaf28703e6a7369808e17b42b8ca8ff024c..f58a832a39f08a5c799bd098ded91cdd426ce0fd 100644 (file)
--- a/src/mcas/Makefile.unit
+++ b/src/mcas/Makefile.unit
@@ -70,7 +70,7 @@ skip_cas_adt_test: skip_adt_test.o skip_cas_adt.o gc.o ptst.o
              $(LDFLAGS)
 
 skip_cas_adt.o: skip_cas_adt.c
-       $(CC) $(CFLAGS) -c -o $@ $<
+       $(CC) $(CFLAGS) -c ${srcdir}/skip_cas_adt.c
 
 clean:
        rm -f $(TARGETS) replay *~ core *.o *.a
@@ -80,15 +80,15 @@ replay: %: %.c $(COMMON_DEPS)
        $(CC) -o $@ $(patsubst %.c,%.o,$<) $(LDFLAGS)
 
 tree_mcas.o: tree_mcas.c mcas.c $(COMMON_DEPS)
-       $(CC) $(CFLAGS) -c -o $@ $<
+       $(CC) $(CFLAGS) -c ${srcdir}/tree_mcas.c
 skip_lock_perpointer.o: skip_lock.c $(COMMON_DEPS)
-       $(CC) $(CFLAGS) -DTINY_MTX -c -o $@ $<
+       $(CC) $(CFLAGS) -DTINY_MTX -c -o skip_lock_perpointer.o ${srcdir}/skip_lock.c
 skip_lock_pernode.o: skip_lock.c $(COMMON_DEPS)
-       $(CC) $(CFLAGS) -c -o $@ $<
+       $(CC) $(CFLAGS) -c -o skip_lock_pernode.o ${srcdir}/skip_lock.c
 skip_lock_perlist.o: skip_lock.c $(COMMON_DEPS)
-       $(CC) $(CFLAGS) -DFAT_MTX -c -o $@ $<
+       $(CC) $(CFLAGS) -DFAT_MTX -c -o skip_lock_perlist.o ${srcdir}/skip_lock.c
 skip_mcas.o: skip_mcas.c mcas.c $(COMMON_DEPS)
-       $(CC) $(CFLAGS) -c -o $@ $<
+       $(CC) $(CFLAGS) -c ${srcdir}/skip_mcas.c
 
 %.o: %.c $(COMMON_DEPS)
        $(CC) $(CFLAGS) -c -o $@ $<

diff --git a/src/rxgen/Makefile.in b/src/rxgen/Makefile.in
index 4a3d23f4add02ad787156b459f0f1c4f27a6afed..89146bc60caa8d0db2173b8ed4d23926a4ebfc24 100644 (file)
--- a/src/rxgen/Makefile.in
+++ b/src/rxgen/Makefile.in
@@ -28,7 +28,7 @@ rxgen: $(OBJS) AFS_component_version_number.c $(HDRS)
        $(CC) $(CFLAGS) $(OBJS) $(XLIBS) -o $@
 
 rpc_main.o: rpc_main.c
-       $(CCOBJ) $(CFLAGS) -c $< -DPATH_CPP="\"$(PATH_CPP)\""
+       $(CCOBJ) $(CFLAGS) -c ${srcdir}/rpc_main.c -DPATH_CPP="\"$(PATH_CPP)\""
 
 #
 # Install targets

diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in
index a46c07cb197efb52779be92435f576bc31e41789..d458fdf4174b96d380d13bc7703be376d5b5edaf 100644 (file)
--- a/src/rxkad/Makefile.in
+++ b/src/rxkad/Makefile.in
@@ -66,7 +66,7 @@ librxkad.a: ${OBJS} AFS_component_version_number.o
 rxkad_client.o: fcrypt.h private_data.h rxkad_client.c ${INCLS}
 
 rxkad_server.o: rxkad_server.c fcrypt.h private_data.h  ${INCLS}
-       $(CC) $(CFLAGS) -c $<
+       $(CC) $(CFLAGS) -c ${srcdir}/rxkad_server.c
 
 rxkad_common.o: fcrypt.h private_data.h rxkad_common.c ${INCLS}
 
@@ -77,10 +77,10 @@ rxkad_errs.c rxkad.h: rxkad_errs.et rxkad.p.h
        ${COMPILE_ET} -p ${srcdir} rxkad_errs -h rxkad
 
 ticket.o: ticket.c lifetimes.h ${INCLS}
-       $(CC) $(CFLAGS) -c $<
+       $(CC) $(CFLAGS) -c ${srcdir}/ticket.c
 
 ticket5.o: ticket5.c v5gen.c v5der.c v5gen-rewrite.h ${INCLS}
-       $(CC) -I${srcdir} $(CFLAGS) -c $<
+       $(CC) -I${srcdir} $(CFLAGS) -c ${srcdir}/ticket5.c
 
 crc.o: crc.c ${INCLS}
 

diff --git a/src/tbudb/Makefile.in b/src/tbudb/Makefile.in
index c5ab62dd7a70953888f18d3631647e8e22ff1a98..039494128f7be1947c5789de51c592f210c6e76a 100644 (file)
--- a/src/tbudb/Makefile.in
+++ b/src/tbudb/Makefile.in
@@ -14,7 +14,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 HELPER_SPLINT=@HELPER_SPLINT@
 
-CCRULE=${MT_CC} ${CFLAGS} ${MT_CFLAGS} -c $<
+CCRULE=${MT_CC} ${CFLAGS} ${MT_CFLAGS} -c
 
 RX=../rx
 UTIL=../util
@@ -73,10 +73,10 @@ budb_errs.h: ${BUDB}/budb_errs.et
 #
 
 rx_pthread.o: ${RX}/rx_pthread.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${RX}/rx_pthread.c
 
 rxkad_errs.o: ../rxkad/rxkad_errs.c
-       ${CCRULE}
+       ${CCRULE} ../rxkad/rxkad_errs.c
 
 # get the pthreaded util stuff compiled here.  we do this instead of
 # using the non-pthreaded libutil.a.  There probably should be a
@@ -84,74 +84,74 @@ rxkad_errs.o: ../rxkad/rxkad_errs.c
 #
 
 assert.o: ${UTIL}/assert.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/assert.c
 
 uuid.o: ${UTIL}/uuid.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/uuid.c
 
 serverLog.o: ${UTIL}/serverLog.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/serverLog.c
 
 fileutil.o: ${UTIL}/fileutil.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/fileutil.c
 
 volparse.o: ${UTIL}/volparse.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/volparse.c
 
 flipbase64.o: ${UTIL}/flipbase64.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/flipbase64.c
 
 netutils.o: ${UTIL}/netutils.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/netutils.c
 
 dirpath.o: ${UTIL}/dirpath.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/dirpath.c
 
 softsig.o: ${UTIL}/softsig.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/softsig.c
 
 hostparse.o: ${UTIL}/hostparse.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/hostparse.c
 
 snprintf.o: ${UTIL}/snprintf.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/snprintf.c
 
 pthread_glock.o: ${UTIL}/pthread_glock.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/pthread_glock.c
 
 
 database.o: ${BUDB}/database.c budb_errs.h ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${BUDB}/database.c
 
 db_alloc.o: ${BUDB}/db_alloc.c budb_errs.h ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${BUDB}/db_alloc.c
 
 db_dump.o: ${BUDB}/db_dump.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${BUDB}/db_dump.c
 
 dbs_dump.o: ${BUDB}/dbs_dump.c budb_errs.h ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${BUDB}/dbs_dump.c
 
 db_lock.o:  ${BUDB}/db_lock.c budb_errs.h ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${BUDB}/db_lock.c
 
 db_text.o:  ${BUDB}/db_text.c budb_errs.h ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${BUDB}/db_text.c
 
 db_hash.o: ${BUDB}/db_hash.c budb_errs.h ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${BUDB}/db_hash.c
 
 ol_verify.o: ${BUDB}/ol_verify.c budb_errs.h ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${BUDB}/ol_verify.c
 
 procs.o: ${BUDB}/procs.c budb_errs.h ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${BUDB}/procs.c
 
 struct_ops.o: ${BUDB}/struct_ops.c budb_errs.h ${TOP_INCDIR}/afs/budb_client.h
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${BUDB}/struct_ops.c
 
 server.o: ${BUDB}/server.c budb_errs.h ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${BUDB}/server.c
 
 
 budb_server: $(SERVER_OBJS) ${LIBS}

diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in
index ae155955c9754e28399e654cfaa183b399b7cbc5..379dc61d3e8ad42e9d21a10aa310c733473fe02d 100644 (file)
--- a/src/tptserver/Makefile.in
+++ b/src/tptserver/Makefile.in
@@ -14,7 +14,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 HELPER_SPLINT=@HELPER_SPLINT@
 ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@
 
-CCRULE=${MT_CC} ${CFLAGS} ${MT_CFLAGS} -c $<
+CCRULE=${MT_CC} ${CFLAGS} ${MT_CFLAGS} -c
 
 RX=../rx
 UTIL=../util
@@ -54,10 +54,10 @@ depinstall:
 #
 
 rx_pthread.o: ${RX}/rx_pthread.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${RX}/rx_pthread.c
 
 rxkad_errs.o: ../rxkad/rxkad_errs.c
-       ${CCRULE}
+       ${CCRULE} ../rxkad/rxkad_errs.c
 
 #
 # get the pthreaded util stuff compiled here.  we do this instead of
@@ -66,65 +66,65 @@ rxkad_errs.o: ../rxkad/rxkad_errs.c
 #
 
 assert.o: ${UTIL}/assert.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/assert.c
 
 uuid.o: ${UTIL}/uuid.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/uuid.c
 
 serverLog.o: ${UTIL}/serverLog.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/serverLog.c
 
 fileutil.o: ${UTIL}/fileutil.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/fileutil.c
 
 volparse.o: ${UTIL}/volparse.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/volparse.c
 
 flipbase64.o: ${UTIL}/flipbase64.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/flipbase64.c
 
 netutils.o: ${UTIL}/netutils.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/netutils.c
 
 dirpath.o: ${UTIL}/dirpath.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/dirpath.c
 
 softsig.o: ${UTIL}/softsig.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/softsig.c
 
 hostparse.o: ${UTIL}/hostparse.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/hostparse.c
 
 snprintf.o: ${UTIL}/snprintf.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/snprintf.c
 
 pthread_glock.o: ${UTIL}/pthread_glock.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/pthread_glock.c
 
 
 ptserver.o: ${PTSERVER}/ptserver.c ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${PTSERVER}/ptserver.c
 
 ptutils.o: ${PTSERVER}/ptutils.c ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${PTSERVER}/ptutils.c
 
 ptprocs.o: ${PTSERVER}/ptprocs.c ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${PTSERVER}/ptprocs.c
 
 utils.o: ${PTSERVER}/utils.c ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${PTSERVER}/utils.c
 
 map.o: ${PTSERVER}/map.c ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${PTSERVER}/map.c
 
 ptint.ss.o: ptint.ss.c
-       ${CCRULE}
+       ${CCRULE} ptint.ss.c
 
 ptint.cs.o: ptint.cs.c
-       ${CCRULE}
+       ${CCRULE} ptint.cs.c
 
 ptint.xdr.o: ptint.xdr.c
-       ${CCRULE}
+       ${CCRULE} ptint.xdr.c
 
 ptint.cs.c: ${PTSERVER}/ptint.xg
        ${RXGEN} -A -x -C -u -o $@ ${srcdir}/${PTSERVER}/ptint.xg
@@ -152,13 +152,13 @@ Kptint.h: ${PTSERVER}/ptint.xg
        ${RXGEN} -A -x -k -h -o Kptint.h ${srcdir}/${PTSERVER}/ptint.xg
 
 display.o: ${PTSERVER}/display.c ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${PTSERVER}/display.c
 
 ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) ${TOP_LIBDIR}/libaudit.a map.o
        ${CC} ${LDFLAGS} -o ptserver ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o map.o $(LIBS) ${MT_LIBS} ${XLIBS} ${TOP_LIBDIR}/libaudit.a
 
 db_verify.o: ${PTSERVER}/db_verify.c ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${PTSERVER}/db_verify.c
 
 db_verify: db_verify.o pterror.o display.o $(LIBS)
        $(CC) ${LDFLAGS} -o db_verify db_verify.o display.o pterror.o $(LIBS) ${MT_LIBS} ${XLIBS}
@@ -167,10 +167,10 @@ ptclient: ptclient.o display.o ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_com
        $(CC) ${LDFLAGS} -o ptclient ptclient.o display.o $(PTOBJS) $(LIBS) ${MT_LIBS} ${XLIBS}
 
 ptclient.o: ${PTSERVER}/ptclient.c ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${PTSERVER}/ptclient.c
 
 ptuser.o: ${PTSERVER}/ptuser.c ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${PTSERVER}/ptuser.c
 
 pterror.h pterror.c: ${PTSERVER}/pterror.et
        $(RM) -f pterror.h pterror.c
@@ -180,34 +180,34 @@ pts: pts.o $(PTOBJS) ${TOP_LIBDIR}/libcmd.a $(LIBS) ${INCLS}
        $(CC) ${LDFLAGS} -o pts pts.o ${TOP_LIBDIR}/libcmd.a $(PTOBJS) ${LIBS} ${MT_LIBS} ${XLIBS}
 
 pts.o: ${PTSERVER}/pts.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${PTSERVER}/pts.c
 
 readgroup: readgroup.o $(PTOBJS) $(LIBS)
        $(CC) ${CFLAGS} -o readgroup readgroup.o $(PTOBJS) ${LIBS} ${MT_LIBS} ${XLIBS}
 
 readgroup.o: ${PTSERVER}/readgroup.c ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${PTSERVER}/readgroup.c
 
 readpwd: readpwd.o $(PTOBJS) $(LIBS)
        $(CC) ${CFLAGS} -o readpwd readpwd.o $(PTOBJS) ${LIBS} ${MT_LIBS} ${XLIBS}
 
 readpwd.o: ${PTSERVER}/readpwd.c ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${PTSERVER}/readpwd.c
 
 testpt: testpt.o $(PTOBJS) ${TOP_LIBDIR}/libcmd.a $(LIBS)
        $(CC) ${CFLAGS} -o testpt testpt.o -lm ${TOP_LIBDIR}/libcmd.a $(PTOBJS) $(LIBS) ${MT_LIBS} ${XLIBS}
 
 testpt.o: ${PTSERVER}/testpt.c ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${PTSERVER}/testpt.c
 
 pt_util: pt_util.o ptutils.o ubik.o utils.o map.o $(PTOBJS) $(LIBS)
        $(CC) ${CFLAGS} -o pt_util pt_util.o ptutils.o ubik.o utils.o map.o $(PTOBJS) ${TOP_LIBDIR}/libcmd.a $(LIBS) ${MT_LIBS} ${XLIBS}
 
 pt_util.o: ${PTSERVER}/pt_util.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${PTSERVER}/pt_util.c
 
 ubik.o: ${PTSERVER}/ubik.c ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${PTSERVER}/ubik.c
 
 prerror.h: pterror.h
        ${INSTALL} $? $@

diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in
index 38b67906b64a2915cac926751ad1a328a500081f..051a8a8b61f53595b3f969233088749dc027dd15 100644 (file)
--- a/src/tvlserver/Makefile.in
+++ b/src/tvlserver/Makefile.in
@@ -16,7 +16,7 @@ ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@
 
 CC=${MT_CC}
 CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} 
-CCRULE=${CC} ${CFLAGS} -c $<
+CCRULE=${CC} ${CFLAGS} -c
 
 RX=../rx
 UTIL=../util
@@ -53,10 +53,10 @@ all: \
 depinstall:
 
 rx_pthread.o: ${RX}/rx_pthread.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${RX}/rx_pthread.c
 
 rxkad_errs.o: ../rxkad/rxkad_errs.c
-       ${CCRULE}
+       ${CCRULE} ../rxkad/rxkad_errs.c
 
 #
 # get the pthreaded util stuff compiled here.  we do this instead of
@@ -65,43 +65,43 @@ rxkad_errs.o: ../rxkad/rxkad_errs.c
 #
 
 assert.o: ${UTIL}/assert.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/assert.c
 
 uuid.o: ${UTIL}/uuid.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/uuid.c
 
 serverLog.o: ${UTIL}/serverLog.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/serverLog.c
 
 fileutil.o: ${UTIL}/fileutil.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/fileutil.c
 
 volparse.o: ${UTIL}/volparse.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/volparse.c
 
 flipbase64.o: ${UTIL}/flipbase64.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/flipbase64.c
 
 netutils.o: ${UTIL}/netutils.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/netutils.c
 
 dirpath.o: ${UTIL}/dirpath.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/dirpath.c
 
 softsig.o: ${UTIL}/softsig.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/softsig.c
 
 hostparse.o: ${UTIL}/hostparse.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/hostparse.c
 
 snprintf.o: ${UTIL}/snprintf.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/snprintf.c
 
 pthread_glock.o: ${UTIL}/pthread_glock.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/pthread_glock.c
 
 get_krbrlm.o: ${UTIL}/get_krbrlm.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${UTIL}/get_krbrlm.c
 
 #
 # Other stuff
@@ -112,41 +112,41 @@ vldb_check: vldb_check.o ${LIBS} AFS_component_version_number.o
        $(CC) ${LDFLAGS} -o vldb_check vldb_check.o AFS_component_version_number.o ${LIBS} ${MT_LIBS} ${XLIBS} 
 
 vldb_check.o: ${VLSERVER}/vldb_check.c 
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${VLSERVER}/vldb_check.c
 
 cnvldb: cnvldb.o ${LIBS} 
        $(CC) ${LDFLAGS} -o cnvldb cnvldb.o ${LIBS} ${MT_LIBS} ${XLIBS}
 
 cnvldb.o: ${VLSERVER}/cnvldb.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${VLSERVER}/cnvldb.c
 
 sascnvldb: sascnvldb.o ${LIBS} 
        $(CC) ${LDFLAGS} -o sascnvldb sascnvldb.o ${LIBS} ${MT_LIBS} ${XLIBS}
 
 sascnvldb.o: ${VLSERVER}/sascnvldb.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${VLSERVER}/sascnvldb.c
 
 vlserver: vlserver.o vlutils.o vlprocs.o vldbint.ss.o vldbint.xdr.o $(LIBS)
        $(CC) ${LDFLAGS} -o vlserver vlserver.o vlutils.o vlprocs.o vldbint.ss.o \
                vldbint.xdr.o $(LIBS) ${MT_LIBS} ${XLIBS} ${TOP_LIBDIR}/libaudit.a
 
 vlserver.o: ${VLSERVER}/vlserver.c ${INCLS} AFS_component_version_number.o
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${VLSERVER}/vlserver.c
 
 vlutils.o: ${VLSERVER}/vlutils.c ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${VLSERVER}/vlutils.c
 
 vlprocs.o: ${VLSERVER}/vlprocs.c ${INCLS}
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${VLSERVER}/vlprocs.c
 
 vldbint.ss.o: vldbint.ss.c 
-       ${CCRULE}
+       ${CCRULE} vldbint.ss.c
 
 vldbint.cs.o: vldbint.cs.c 
-       ${CCRULE}
+       ${CCRULE} vldbint.cs.c
 
 vldbint.xdr.o: vldbint.xdr.c 
-       ${CCRULE}
+       ${CCRULE} vldbint.xdr.c
 
 vldbint.cs.c: ${VLSERVER}/vldbint.xg
        ${RXGEN} -A -u -x -C -o $@ ${srcdir}/${VLSERVER}/vldbint.xg
@@ -174,10 +174,10 @@ vlclient: vlclient.o $(OBJS) $(LIBS) ${INCLS}
        $(CC) ${LDFLAGS} -o vlclient vlclient.o $(OBJS) $(LIBS) ${MT_LIBS} ${XLIBS} ${TOP_LIBDIR}/libcmd.a
 
 vlclient.o: ${VLSERVER}/vlclient.c
-       ${CCRULE}
+       ${CCRULE} ${srcdir}/${VLSERVER}/vlclient.c
 
 vl_errors.o: vl_errors.c
-       ${CCRULE}
+       ${CCRULE} 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

diff --git a/src/vol/Makefile.in b/src/vol/Makefile.in
index a3e60655d914eae00065363a4b20a19bfcb461ad..1eb8cff9bba42cbd79a2526cd4af4a000ea48cc6 100644 (file)
--- a/src/vol/Makefile.in
+++ b/src/vol/Makefile.in
@@ -175,7 +175,7 @@ vol-salvage.o salvager.o: vol-salvage.h
 vol-salvage.o: salvsync.h daemon_com.h
 
 salvager.o: salvager.c
-       $(CC) $(CFLAGS) -c $<
+       $(CC) $(CFLAGS) -c ${srcdir}/salvager.c
 
 vlib.a:        ${VLIBOBJS} AFS_component_version_number.o
        $(RM) -f $@