Portability fix: better support for BSD make

diff --git a/src/icmp/Makefile.am b/src/icmp/Makefile.am
index 1979ef9d9ebef764c9917ea15cf582953a3a95ae..e162701b44aeb3ee81642d7e77f06eea299c4540 100644 (file)
--- a/src/icmp/Makefile.am
+++ b/src/icmp/Makefile.am
@@ -85,26 +85,25 @@ CLEANFILES += $(COPIED_SOURCE)
 ## files we need to pull in from other locations
 ## copied like this to avoid subdir-objects collisions on 'make clean'
 debug.cc: $(top_srcdir)/src/debug.cc
-       cp $< $@
+       cp $(top_srcdir)/src/debug.cc $@
 
-globals.cc: $(top_srcdir)/src/globals.h
-       cp $(top_builddir)/src/globals.cc .
+globals.cc: $(top_srcdir)/src/globals.cc
+       cp $(top_builddir)/src/globals.cc $@
 
 time.cc: $(top_srcdir)/src/time.cc
-       cp $< $@
+       cp $(top_srcdir)/src/time.cc $@
 
 SquidConfig.cc: $(top_srcdir)/src/SquidConfig.cc
-       cp $< $@
+       cp $(top_srcdir)/src/SquidConfig.cc $@
 
 SquidNew.cc: $(top_srcdir)/src/SquidNew.cc
-       cp $< $@
+       cp $(top_srcdir)/src/SquidNew.cc $@
 
 stub_HelperChildConfig.cc: $(top_srcdir)/src/tests/stub_HelperChildConfig.cc
-       cp $< $@
+       cp $(top_srcdir)/src/tests/stub_HelperChildConfig.cc $@
 
 stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc STUB.h
-       cp $< $@
+       cp $(top_srcdir)/src/tests/stub_libmem.cc $@
 
 STUB.h: $(top_srcdir)/src/tests/STUB.h
-       cp $< $@
-       
\ No newline at end of file
+       cp $(top_srcdir)/src/tests/STUB.h $@

diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index 7f8ce9b57efd6b5b5a07aa177eea9408f68b436c..58f9208c4f08afb66e8c21e45e2b84e55ec11877 100644 (file)
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -71,28 +71,28 @@ DEBUG_SOURCE = test_tools.cc $(STUBS)
 CLEANFILES += $(STUBS)
 
 stub_cbdata.cc: $(top_srcdir)/src/tests/stub_cbdata.cc
-       cp $< $@
+       cp $(top_srcdir)/src/tests/stub_cbdata.cc $@
 
 stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc
-       cp $< $@
+       cp $(top_srcdir)/src/tests/stub_debug.cc $@
 
 stub_MemBuf.cc: $(top_srcdir)/src/tests/stub_MemBuf.cc
-       cp $< $@
+       cp $(top_srcdir)/src/tests/stub_MemBuf.cc $@
 
 stub_SBuf.cc: $(top_srcdir)/src/tests/stub_SBuf.cc
-       cp $< $@
+       cp $(top_srcdir)/src/tests/stub_SBuf.cc $@
 
 stub_tools.cc: $(top_srcdir)/src/tests/stub_tools.cc
-       cp $< $@
+       cp $(top_srcdir)/src/tests/stub_tools.cc $@
 
 stub_fatal.cc: $(top_srcdir)/src/tests/stub_fatal.cc
-       cp $< $@
+       cp $(top_srcdir)/src/tests/stub_fatal.cc $@
 
-stub_libmem.cc : $(top_srcdir)/src/tests/stub_libmem.cc STUB.h
-       cp $< $@
+stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc STUB.h
+       cp $(top_srcdir)/src/tests/stub_libmem.cc $@
        
-STUB.h : $(top_srcdir)/src/tests/STUB.h
-       cp $< $@
+STUB.h: $(top_srcdir)/src/tests/STUB.h
+       cp $(top_srcdir)/src/tests/STUB.h $@
 
 ## XXX: somewhat broken. Its meant to test our debugs() implementation.
 ## but it has never been linked to the actual src/debug.cc implementation !!

diff --git a/tools/Makefile.am b/tools/Makefile.am
index abf810d3db448caa8827bdd26d2e9b5b3c51ded0..5884ab9b19155285327d10ef5fb915386a0652cf 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -29,19 +29,19 @@ include $(top_srcdir)/doc/manuals/Substitute.am
 ## Several files need to be shared but we cannot depend on the other
 ## directories to be built.
 test_tools.cc: $(top_srcdir)/test-suite/test_tools.cc
-       cp $< $@
+       cp $(top_srcdir)/test-suite/test_tools.cc $@
 
 stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc
-       cp $< $@
+       cp $(top_srcdir)/src/tests/stub_debug.cc $@
 
 time.cc: $(top_srcdir)/src/time.cc
-       cp $< $@
+       cp $(top_srcdir)/src/time.cc $@
 
-stub_libmem.cc : $(top_srcdir)/src/tests/stub_libmem.cc STUB.h
-       cp $< $@
+stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc STUB.h
+       cp $(top_srcdir)/src/tests/stub_libmem.cc $@
        
-STUB.h : $(top_srcdir)/src/tests/STUB.h
-       cp $< $@
+STUB.h: $(top_srcdir)/src/tests/STUB.h
+       cp $(top_srcdir)/src/tests/STUB.h $@
 
 # stock tools for unit tests - library independent versions of dlink_list
 # etc.

diff --git a/tools/squidclient/Makefile.am b/tools/squidclient/Makefile.am
index 297d57aa305a8849d714a4f733584a84685f8aa5..337fcacaf19abdb6130850a67af9431546013874 100644 (file)
--- a/tools/squidclient/Makefile.am
+++ b/tools/squidclient/Makefile.am
@@ -27,19 +27,19 @@ include $(top_srcdir)/doc/manuals/Substitute.am
 ## Several files need to be shared but we cannot depend on the other
 ## directories to be built.
 test_tools.cc: $(top_srcdir)/test-suite/test_tools.cc
-       cp $< $@
+       cp $(top_srcdir)/test-suite/test_tools.cc $@
 
 stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc
-       cp $< $@
+       cp $(top_srcdir)/src/tests/stub_debug.cc $@
 
 time.cc: $(top_srcdir)/src/time.cc
        cp $< $@
 
-stub_libmem.cc : $(top_srcdir)/src/tests/stub_libmem.cc STUB.h
-       cp $< $@
+stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc STUB.h
+       cp $(top_srcdir)/src/tests/stub_libmem.cc $@
        
-STUB.h : $(top_srcdir)/src/tests/STUB.h
-       cp $< $@
+STUB.h: $(top_srcdir)/src/tests/STUB.h
+       cp $(top_srcdir)/src/tests/STUB.h $@
        
 
 # stock tools for unit tests - library independent versions of dlink_list