Merge pull request uniconproject#482 from Jafaral/cp-fix

Makefile: use CP variable instead of cp where possible

ipl/Makefile

@@ -6,7 +6,7 @@ include ../Makedefs.uni
 
 Ilib:	../bin/libcfunc.so
 ../bin/libcfunc.so:  ../bin/$(UNICONT)
-	cp incl/*.icn gincl/*.icn cfuncs/icall.h ../lib
+	$(CP) incl/*.icn gincl/*.icn cfuncs/icall.h ../lib
 	$(MAKE) -C procs
 	$(MAKE) -C gprocs
 	$(MAKE) -C mprocs

ipl/lib/Makefile

@@ -7,7 +7,7 @@ all:
 
 Cfun:
 	cd ../cfuncs; LPATH= $(MAKE) ICONT=../../bin/$(UNICONT)
-	-cd ../cfuncs; cp cfunc.u ../lib
+	-cd ../cfuncs; $(CP) cfunc.u ../lib
 	-cd ../cfuncs; cp libcfunc.so ../../bin
 
 clean Clean Pure:

ipl/mprocs/Makefile

@@ -7,7 +7,7 @@ IC=../../bin/$(UNICONT)
 UFLAGS= -usc
 
 all:$(TARGETS)
-	@cp *.u ../lib/
+	@$(CP) *.u ../lib/
 
 %.u: %.icn
 	@echo $<

ipl/procs/Makefile

@@ -6,7 +6,7 @@ IC=../../bin/$(UNICONT)
 UFLAGS= -usc
 
 all:$(TARGETS)
-	@cp *.u ../lib/
+	@$(CP) *.u ../lib/
 
 %.u: %.icn
 	@echo $<

plugins/src/Makefile

@@ -61,7 +61,7 @@ $(PMOS): $(LIBD)/uso.u
 
 # Unicon interface
 $(LIBD)/%.u:	%.icn $(CSRC)
-	cp $< $(LIBD)/
+	$(CP) $< $(LIBD)/
 	cd $(LIBD); $(UC) $(UFLAGS) $<
 	rm $(LIBD)/$<
 

src/gdbm/Makefile

@@ -81,7 +81,7 @@ CP_HEADERS:gdbm.h ndbm.h
 
 gdbm.h:	gdbm.proto gdbmerrno.h gdbm.proto2
 	$(RM) gdbm.h
-	cp $(srcdir)/gdbm.proto gdbm.h
+	$(CP) $(srcdir)/gdbm.proto gdbm.h
 	-chmod +w gdbm.h
 	grep _ $(srcdir)/gdbmerrno.h >> gdbm.h
 	cat $(srcdir)/gdbm.proto2 >> gdbm.h
@@ -103,7 +103,7 @@ testndbm: testndbm.o libgdbm.a
 	$(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm.a
 
 tndbm.o: testndbm.c
-	cp $(srcdir)/testndbm.c ./tndbm.c
+	$(CP) $(srcdir)/testndbm.c ./tndbm.c
 	$(CC) -c -I. -I$(srcdir) $(CFLAGS) $(DEFS) ./tndbm.c
 	rm -f ./tndbm.c
 

src/lib/audio/Makefile

@@ -18,7 +18,7 @@ staticlib: $(ARCHIVE)
 $(ARCHIVE): $(OBJECTS)
 	rm -f $(ARCHIVE)
 	ar $(ARFLAGS) $(ARCHIVE) $(OBJECTS)
-	cp $(ARCHIVE) ../../../bin
+	$(CP) $(ARCHIVE) ../../../bin
 	rm *.o
 
 al.o : al.c base.h config.h

src/runtime/Makefile

@@ -64,19 +64,19 @@ interp_all: update_rev
 # NTCONDEP is set to NTCON on windows only to add a dependency that sets NTCONSOLE
 $(UNICONX) $(ICONXEXE): $(NTCONDEP) $(OBJS) ../../rt/lib/libucommon.a ../../rt/lib/libuconsole.a ../../rt/lib/libgdbm.a ../../rt/lib/libtp.a
 	$(CC) $(LDFLAGS) $(WSUBSYS) $(WSTKLDFLAG) $(RLINK) -o $(UNICONX)  $(OBJS) $(XLIBS) $(RLIBS) $(XL) $(LIBSTDCPP) $(WGLIBS) -luconsole
-	cp $(UNICONX)$(EXE) ../../bin
+	$(CP) $(UNICONX)$(EXE) ../../bin
 	$(STRIP) ../../bin/$(UNICONX)$(EXE);
 
 # on windows, always add WNTCON dependency to set NTCONSOLE accordingly
 $(UNICONWX) $(WICONEXE): WNTCON $(OBJS) ../../rt/lib/libucommon.a ../../rt/lib/libwuconsole.a ../../rt/lib/libgdbm.a ../../rt/lib/libtp.a
 	$(CC) $(LDFLAGS) -Wl,--subsystem,windows $(WSTKLDFLAG) $(RLINK) -o $(UNICONWX)  $(OBJS) $(XLIBS) $(RLIBS) $(XL) $(LIBSTDCPP) $(WGLIBS) -lwuconsole
-	cp $(UNICONWX)$(EXE) ../../bin
+	$(CP) $(UNICONWX)$(EXE) ../../bin
 	$(STRIP) ../../bin/$(UNICONWX)$(EXE);
 
 # prepare the icon for the executables
 icon.$(O):
-	cp -u ../../config/win32/gcc/icon.rc .
-	cp -u ../../config/win32/gcc/unicon.ico .
+	$(CP) -u ../../config/win32/gcc/icon.rc .
+	$(CP) -u ../../config/win32/gcc/unicon.ico .
 	windres $(RCFLAGS) icon.rc icon.$(O)
 
 #

uni/udb/Makefile

@@ -54,7 +54,7 @@ tools:
 
 udb: $(UFILES) $(LIBRARY) $(DTA_UFILES)
 	$(UC) $(ldflags) $(LIBRARY) $(DTA_UFILES) $(UFILES) -o udb
-	cp udb$(EXE) ../../bin
+	$(CP) udb$(EXE) ../../bin
 
 udb.u: udb.icn console.u
 	$(UC) $(cflags) udb

uni/udb/lib/Makefile

@@ -31,7 +31,7 @@ lib: $(UFILES)
 
 
 tools: listener.u $(Tools)
-	cp $(Tools) ../../../bin
+	$(CP) $(Tools) ../../../bin
 
 $(Tools): $%
 	$(UC) $(UFLAGS) $(STANDALONE) $(LDFLAGS) $@

uni/uflex/Makefile

@@ -14,7 +14,7 @@ all: $(PROGRAM)
 
 $(PROGRAM): flexgram.u main.u uflex-lex.u ulexskel.u automata.u tree.u convert.u automatadfa.u uflexskel.u
 	$(UNICON) -s -o uflex flexgram.u main.u uflex-lex.u ulexskel.u uflexskel.u automata.u tree.u convert.u automatadfa.u ulpp.icn
-	@cp $(PROGRAM) ../../bin/
+	@$(CP) $(PROGRAM) ../../bin/
 	@cd test; $(MAKE)
 
 flexgram.icn flexgram_tab.icn: flexgram.y