[SCM] juce/master: put libjuce_builddate.h and juce(-dbg).pc into $OUTDIR

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Wed Feb 10 20:53:48 UTC 2016


The following commit has been merged in the master branch:
commit f05602256946a3c43f6e47dec938165cd9d9c389
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Wed Feb 10 21:07:16 2016 +0100

    put libjuce_builddate.h and juce(-dbg).pc into $OUTDIR

diff --git a/debian/libbuilder/Makefile b/debian/libbuilder/Makefile
index af46073..d7659f4 100644
--- a/debian/libbuilder/Makefile
+++ b/debian/libbuilder/Makefile
@@ -127,7 +127,7 @@ $(OBJDIR_DEBUG)/dir_stamp:
 $(OUTDIR)/$(TARGET_RELEASE): $(OBJECTS_RELEASE) $(RESOURCES)
 	@echo Linking $(TARGET_RELEASE)
 	$(CXX) -o $@ $^ -Wl,-soname,$(TARGET_RELEASE).$(SHORTSONAME) $(JUCE_LDFLAGS) $(JUCE_LDFLAGS_RELEASE) $(LDFLAGS) $(TARGET_ARCH)
-$(OBJDIR_RELEASE)/%.o: $(OUTDIR)/%.cpp libjuce_builddate.h $(OBJDIR_RELEASE)/dir_stamp
+$(OBJDIR_RELEASE)/%.o: $(OUTDIR)/%.cpp $(OUTDATE)/libjuce_builddate.h $(OBJDIR_RELEASE)/dir_stamp
 	$(CXX) $(JUCE_CPPFLAGS) $(JUCE_CFLAGS_RELEASE) $(JUCE_CFLAGS) $(JUCE_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OUTDIR)/$(TARGET_DEBUG): $(OBJECTS_DEBUG) $(RESOURCES)
@@ -137,7 +137,7 @@ $(OBJDIR_DEBUG)/%.o: $(OUTDIR)/%.cpp libjuce_builddate.h $(OBJDIR_DEBUG)/dir_sta
 	$(CXX) $(JUCE_CPPFLAGS) $(JUCE_CFLAGS_DEBUG) $(JUCE_CFLAGS) $(JUCE_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) -o "$@" -c "$<"
 
 libjuce_builddate.h:
-	touch libjuce_builddate.h
+	touch $@
 
 clean:
 	@echo Cleaning juce_dll
@@ -177,7 +177,7 @@ install: install-headers install-lib-release install-lib-debug install-pkgconfig
 introjucer: $(OUTDIR)/$(TARGET_RELEASE)
 	$(MAKE) -C $(INTROJUCER_PATH) CONFIG=Release CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 
-juce-dbg.pc juce.pc: juce.pc.in
+$(OUTDIR)/juce-dbg.pc $(OUTDIR)/juce.pc: juce.pc.in
 	sed \
 		-e 's|@prefix@|$(prefix)|g' \
 		-e 's|@libdir@|$(libdir)|g' \

-- 
juce packaging



More information about the pkg-multimedia-commits mailing list