[SCM] juce/master: ...

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


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

    ...

diff --git a/debian/libbuilder/Makefile b/debian/libbuilder/Makefile
index c2da794..5062816 100644
--- a/debian/libbuilder/Makefile
+++ b/debian/libbuilder/Makefile
@@ -117,24 +117,21 @@ OBJECTS_DEBUG=$(SOURCES:%.cpp=$(OBJDIR_DEBUG)/%.o)
 
 all: $(TARGET) introjucer
 
-$(OBJDIR_RELEASE)/dir_stamp:
-	@mkdir -p $(OBJDIR_RELEASE)
-	@touch $@
-$(OBJDIR_DEBUG)/dir_stamp:
-	@mkdir -p $(OBJDIR_DEBUG)
+$(OBJDIR_RELEASE)/dir_stamp $(OBJDIR_DEBUG)/dir_stamp:
+	@mkdir -p $(dir $@)
 	@touch $@
 
 $(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 $(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)
 	@echo Linking $(TARGET_DEBUG)
 	$(CXX) -o $@ $^ -Wl,-soname,$(TARGET_DEBUG).$(SHORTSONAME) $(JUCE_LDFLAGS) $(JUCE_LDFLAGS_DEBUG) $(LDFLAGS) $(TARGET_ARCH)
-$(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 "$<"
+
+$(OBJDIR_DEBUG)/%.o: $(OUTDIR)/%.cpp $(OUTDIR)/libjuce_builddate.h $(OBJDIR_DEBUG)/dir_stamp
+	$(CXX) $(JUCE_CPPFLAGS) $(JUCE_CFLAGS_DEBUG) $(JUCE_CFLAGS) $(JUCE_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
+$(OBJDIR_RELEASE)/%.o: $(OUTDIR)/%.cpp $(OUTDIR)/libjuce_builddate.h $(OBJDIR_RELEASE)/dir_stamp
+	$(CXX) $(JUCE_CPPFLAGS) $(JUCE_CFLAGS_RELEASE) $(JUCE_CFLAGS) $(JUCE_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
 
 $(OUTDIR)/libjuce_builddate.h:
 	@mkdir $(OUTDIR)

-- 
juce packaging



More information about the pkg-multimedia-commits mailing list