Jelajahi Sumber

Simplify build by moving common target rule to build/build.mk

Bryan Drewery 12 tahun lalu
induk
melakukan
7707d6b1ff
4 mengubah file dengan 19 tambahan dan 41 penghapusan
  1. 14 0
      build/build.mk
  2. 1 14
      src/Makefile.in
  3. 2 13
      src/compat/Makefile.in
  4. 2 14
      src/crypto/Makefile.in

+ 14 - 0
build/build.mk

@@ -0,0 +1,14 @@
+depcomp = /bin/sh $(top_srcdir)/build/autotools/depcomp
+
+%.o: %.c $(top_srcdir)/src/stringfix $(top_srcdir)/build/cc1plus
+	@echo -e "Compiling: \033[1m$*\033[0m"
+ifeq ($(CCDEPMODE),gcc3)
+	if STRINGFIX='$(top_srcdir)/$(STRINGFIX)' $(CXX) -MT '$@' -MD -MP -MF '.deps/$*.TPo' -DSTRINGFIX=$(STRINGFIX) -B$(top_srcdir)/build $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@; then \
+	mv '.deps/$*.TPo' '.deps/$*.Po'; \
+	else rm -f '.deps/$*.Tpo'; exit 1; \
+	fi
+else
+	# STRINGFIX included after CXX for ccache to recognize
+	STRINGFIX="$(top_srcdir)/$(STRINGFIX)" libtool=no source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
+	$(CXX) -DSTRINGFIX=$(STRINGFIX) -B$(top_srcdir)/build $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
+endif

+ 1 - 14
src/Makefile.in

@@ -10,7 +10,7 @@ VPATH = @srcdir@
 CXXFLAGS = @CXXFLAGS@ -I. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/pack @DEFS@ $(INCLUDES) $(CFLGS) '-DCOMMIT="$(COMMIT)"' '-DBRANCH="$(BRANCH)"' -DBUILDTS=$(BUILDTS) '-DVERSION="$(VERSION)"'
 CPPFLAGS = @CPPFLAGS@
 
-depcomp = /bin/sh $(top_srcdir)/build/autotools/depcomp
+include $(top_srcdir)/build/build.mk
 
 OBJCOPY = @OBJCOPY@
 
@@ -129,16 +129,3 @@ mycrypto:
 	+@cd crypto && $(MAKE_GENERIC) crypto
 
 include ./.deps/includes
-
-%.o: %.c stringfix@EXEEXT@ $(top_srcdir)/build/cc1plus
-	@echo -e "Compiling: \033[1m$*\033[0m"
-ifeq ($(CCDEPMODE),gcc3)
-	if STRINGFIX='$(top_srcdir)/$(STRINGFIX)' $(CXX) -MT '$@' -MD -MP -MF '.deps/$*.TPo' -DSTRINGFIX=$(STRINGFIX) -B$(top_srcdir)/build $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@; then \
-	mv '.deps/$*.TPo' '.deps/$*.Po'; \
-	else rm -f '.deps/$*.Tpo'; exit 1; \
-	fi
-else
-	# STRINGFIX included after CXX for ccache to recognize
-	STRINGFIX="$(top_srcdir)/$(STRINGFIX)" libtool=no source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CXX) -DSTRINGFIX=$(STRINGFIX) -B$(top_srcdir)/build $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
-endif

+ 2 - 13
src/compat/Makefile.in

@@ -4,7 +4,8 @@ SHELL = @SHELL@
 top_srcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-depcomp = /bin/sh $(top_srcdir)/build/autotools/depcomp
+
+include $(top_srcdir)/build/build.mk
 
 @SET_MAKE@
 
@@ -36,15 +37,3 @@ clean:
 compat: $(OBJS)
 
 include ./.deps/includes
-
-%.o: %.c
-	@echo -e "Compiling: \033[1m$*\033[0m"
-ifeq ($(CCDEPMODE),gcc3)
-	if $(CXX) -MT '$@' -MD -MP -MF '.deps/$*.TPo' $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@; then \
-	mv '.deps/$*.TPo' '.deps/$*.Po'; \
-	else rm -f '.deps/$*.Tpo'; exit 1; \
-	fi
-else
-	libtool=no source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
-endif

+ 2 - 14
src/crypto/Makefile.in

@@ -6,9 +6,9 @@ SHELL = @SHELL@
 CXXFLAGS = @CXXFLAGS@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib @DEFS@ $(CFLGS)
 CPPFLAGS = @CPPFLAGS@
 STRIP = @STRIP@
-
 VPATH = @srcdir@
-depcomp = /bin/sh $(top_srcdir)/build/autotools/depcomp
+
+include $(top_srcdir)/build/build.mk
 
 @SET_MAKE@
 
@@ -29,15 +29,3 @@ clean:
 crypto: $(OBJS)
 
 include ./.deps/includes
-
-%.o: %.c
-	@echo -e "Compiling: \033[1m$*\033[0m"
-ifeq ($(CCDEPMODE),gcc3)
-	if $(CXX) -MT '$@' -MD -MP -MF '.deps/$*.TPo' $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@; then \
-	mv '.deps/$*.TPo' '.deps/$*.Po'; \
-	else rm -f '.deps/$*.Tpo'; exit 1; \
-	fi
-else
-	libtool=no source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
-endif