[SCM] juce/master: simplify VPATH by generating intermediate cpp-files

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 97e62be4bc8e4a3ce7e777063b7df848b1e07a78
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Wed Feb 10 20:53:56 2016 +0100

    simplify VPATH by generating intermediate cpp-files

diff --git a/debian/libbuilder/Makefile b/debian/libbuilder/Makefile
index a822401..af46073 100644
--- a/debian/libbuilder/Makefile
+++ b/debian/libbuilder/Makefile
@@ -6,8 +6,6 @@ includedir = $(prefix)/include
 SONAME=0.0.0
 SHORTSONAME=0
 
-
-
 # (this disables dependency generation if multiple architectures are set)
 DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)
 
@@ -36,7 +34,7 @@ SOURCES=juce_audio_basics.cpp \
 	juce_video.cpp \
 	$(empty)
 
-VPATH=$(MODULES_PATH)/juce_audio_basics:$(MODULES_PATH)/juce_audio_devices:$(MODULES_PATH)/juce_audio_formats:$(MODULES_PATH)/juce_audio_processors:$(MODULES_PATH)/juce_audio_utils:$(MODULES_PATH)/juce_box2d:$(MODULES_PATH)/juce_core:$(MODULES_PATH)/juce_cryptography:$(MODULES_PATH)/juce_data_structures:$(MODULES_PATH)/juce_events:$(MODULES_PATH)/juce_graphics:$(MODULES_PATH)/juce_gui_basics:$(MODULES_PATH)/juce_gui_extra:$(MODULES_PATH)/juce_osc:$(MODULES_PATH)/juce_opengl:$(MODULES_PATH)/juce_video
+VPATH=$(OUTDIR)
 
 JUCELIBS_CPPFLAGS :=
 JUCELIBS_CFLAGS   :=
@@ -129,13 +127,13 @@ $(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: %.cpp libjuce_builddate.h $(OBJDIR_RELEASE)/dir_stamp
+$(OBJDIR_RELEASE)/%.o: $(OUTDIR)/%.cpp 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: %.cpp libjuce_builddate.h $(OBJDIR_DEBUG)/dir_stamp
+$(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:
@@ -188,3 +186,7 @@ juce-dbg.pc juce.pc: juce.pc.in
 		-e 's|@REQUIRED_PKG@|$(JUCELIBS)|g' \
 		-e 's|@REQUIRED_LIBS@|$(JUCELIBS_LIBS)|g' \
 		$^ > $@
+
+
+%.cpp:
+	echo '#include "$(MODULES_PATH)/$(basename $(notdir $@))/$(notdir $@)"' > $(OUTDIR)/$(notdir $@)

-- 
juce packaging