[SCM] juce/master: put libjuce_builddate.h 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 01a444bccb8c32d0da575904c4f11b806bacca43
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Wed Feb 10 21:10:48 2016 +0100

    put libjuce_builddate.h into $(OUTDIR)

diff --git a/debian/libbuilder/Makefile b/debian/libbuilder/Makefile
index d7659f4..c2da794 100644
--- a/debian/libbuilder/Makefile
+++ b/debian/libbuilder/Makefile
@@ -91,7 +91,7 @@ JUCE_CPPFLAGS := $(DEPFLAGS) $(JUCE_CPPFLAGS) \
 	-D "LINUX=1" \
 	-D "JUCE_DLL_BUILD=1" \
 	$(JUCELIBS_CPPFLAGS) \
-	-I. \
+	-I. -I$(OUTDIR) \
 	$(empty)
 
 JUCE_CFLAGS += \
@@ -136,7 +136,8 @@ $(OUTDIR)/$(TARGET_DEBUG): $(OBJECTS_DEBUG) $(RESOURCES)
 $(OBJDIR_DEBUG)/%.o: $(OUTDIR)/%.cpp libjuce_builddate.h $(OBJDIR_DEBUG)/dir_stamp
 	$(CXX) $(JUCE_CPPFLAGS) $(JUCE_CFLAGS_DEBUG) $(JUCE_CFLAGS) $(JUCE_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) -o "$@" -c "$<"
 
-libjuce_builddate.h:
+$(OUTDIR)/libjuce_builddate.h:
+	@mkdir $(OUTDIR)
 	touch $@
 
 clean:
diff --git a/debian/rules b/debian/rules
index 584d683..e6c1207 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ BUILD_DATE=$(shell date -u -d "$$(dpkg-parsechangelog -SDate)" +"%h %d %Y")
 #export DEB_CPPFLAGS_MAINT_APPEND = -DBUILD_DATE='"$(BUILD_DATE)"'
 
 DEB_SRCDIR=debian/libbuilder/
-BUILDDATE_HEADER=$(DEB_SRCDIR)libjuce_builddate.h
+BUILDDATE_HEADER=$(DEB_SRCDIR)build/libjuce_builddate.h
 
 include /usr/share/cdbs/1/rules/buildcore.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -22,6 +22,7 @@ DEB_MAKE_CHECK_TARGET = test
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(cdbs_make_curdestdir) prefix=/usr libdir=/usr/lib/${DEB_HOST_MULTIARCH}/
 
 pre-build::
+	mkdir -p $(dir $(BUILDDATE_HEADER))
 	test -e $(BUILDDATE_HEADER) || (echo "#define BUILD_DATE \"$(BUILD_DATE)\"" > $(BUILDDATE_HEADER))
 
 build/libjuce-doc::

-- 
juce packaging



More information about the pkg-multimedia-commits mailing list