Răsfoiți Sursa

* Avoid needing `basename`

Bryan Drewery 14 ani în urmă
părinte
comite
592d672281
4 a modificat fișierele cu 8 adăugiri și 8 ștergeri
  1. 2 2
      src/Makefile.in
  2. 2 2
      src/compat/Makefile.in
  3. 2 2
      src/crypto/Makefile.in
  4. 2 2
      src/mod/mod.mk.in

+ 2 - 2
src/Makefile.in

@@ -131,7 +131,7 @@ mycrypto:
 include ./.deps/includes
 include ./.deps/includes
 
 
 %.o: %.c stringfix@EXEEXT@ $(top_srcdir)/build/cc1plus
 %.o: %.c stringfix@EXEEXT@ $(top_srcdir)/build/cc1plus
-	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
+	@echo -e "Compiling: \033[1m$*\033[0m"
 	# STRINGFIX included after CXX for ccache to recognize
 	# STRINGFIX included after CXX for ccache to recognize
 	stringfix="$(top_srcdir)/$(STRINGFIX)" source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
 	stringfix="$(top_srcdir)/$(STRINGFIX)" source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CXX) -DSTRINGFIX=$(STRINGFIX) -B$(top_srcdir)/build $(CXXFLAGS) $(CPPFLAGS) -c $<  -o `basename $< .c`.o
+	$(CXX) -DSTRINGFIX=$(STRINGFIX) -B$(top_srcdir)/build $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@

+ 2 - 2
src/compat/Makefile.in

@@ -41,9 +41,9 @@ include ./.deps/includes
 .SUFFIXES: .c .o .h
 .SUFFIXES: .c .o .h
 
 
 .c.o:
 .c.o:
-	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
+	@echo -e "Compiling: \033[1m$*\033[0m"
 	source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
 	source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CXX) $(CXXFLAGS) -I../.. -I$(top_srcdir) -I$(top_srcdir)/src $(CPPFLAGS) -c $< 
+	$(CXX) $(CXXFLAGS) -I../.. -I$(top_srcdir) -I$(top_srcdir)/src $(CPPFLAGS) -c $< -o $@
 
 
 
 
 #safety hash
 #safety hash

+ 2 - 2
src/crypto/Makefile.in

@@ -34,9 +34,9 @@ include ./.deps/includes
 .SUFFIXES: .c .o .h
 .SUFFIXES: .c .o .h
 
 
 .c.o:
 .c.o:
-	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
+	@echo -e "Compiling: \033[1m$*\033[0m"
 	source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
 	source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CXX) $(CXXFLAGS) -I../.. -I$(top_srcdir) -I$(top_srcdir)/src $(CPPFLAGS) -c $<
+	$(CXX) $(CXXFLAGS) -I../.. -I$(top_srcdir) -I$(top_srcdir)/src $(CPPFLAGS) -c $< -o $@
 
 
 
 
 
 

+ 2 - 2
src/mod/mod.mk.in

@@ -1,7 +1,7 @@
 depcomp = /bin/sh $(top_srcdir)/build/autotools/depcomp
 depcomp = /bin/sh $(top_srcdir)/build/autotools/depcomp
 
 
 ../%.o: %.c $(top_srcdir)/src/stringfix $(top_srcdir)/build/cc1plus
 ../%.o: %.c $(top_srcdir)/src/stringfix $(top_srcdir)/build/cc1plus
-	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
+	@echo -e "Compiling: \033[1m$*\033[0m"
 	# STRINGFIX included after CXX for ccache to recognize
 	# STRINGFIX included after CXX for ccache to recognize
 	stringfix="$(top_srcdir)/$(STRINGFIX)" source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
 	stringfix="$(top_srcdir)/$(STRINGFIX)" source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CXX) -DSTRINGFIX=$(STRINGFIX) -B$(top_srcdir)/build $(CXXFLAGS) $(CPPFLAGS) -c $<  -o ../`basename $< .c`.o
+	$(CXX) -DSTRINGFIX=$(STRINGFIX) -B$(top_srcdir)/build $(CXXFLAGS) $(CPPFLAGS) -c $<  -o $@