[SCM] juce/master: prefix common build flags with JUCE_

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 623433bfcf785b4fa94dfeb43e2ac8fbfcfd77c0
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Thu Jan 21 16:32:18 2016 +0100

    prefix common build flags with JUCE_
    
    so we can add additional buildflags

diff --git a/debian/libbuilder/Makefile b/debian/libbuilder/Makefile
index b247207..db0641c 100644
--- a/debian/libbuilder/Makefile
+++ b/debian/libbuilder/Makefile
@@ -37,32 +37,34 @@ ifeq ($(TARGET_ARCH),)
   TARGET_ARCH := -march=native
 endif
 
-CPPFLAGS := $(DEPFLAGS) \
+JUCE_CPPFLAGS := $(DEPFLAGS) \
 	-D "LINUX=1" \
 	-D "NDEBUG=1" \
 	-D "DEBUG=0" \
 	-D "JUCE_DLL_BUILD=1" \
 	$(empty)
-#CPPFLAGS := $(CPPFLAGS)  \
+#JUCE_CPPFLAGS := $(JUCE_CPPFLAGS)  \
 #	-D "JUCER_LINUX_MAKE_6D53C8B4=1" \
 #	-D "JUCE_APP_VERSION=1.0.0" \
 #	-D "JUCE_APP_VERSION_HEX=0x10000" \
 #	$(empty)
-CPPFLAGS := $(CPPFLAGS) \
-	-I /usr/include \
+JUCE_CPPFLAGS := $(JUCE_CPPFLAGS) \
 	-I /usr/include/freetype2 \
 	-I . \
 	$(empty)
-CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -fPIC \
+JUCE_CFLAGS += $(JUCE_CPPFLAGS) \
+	$(TARGET_ARCH) \
+	-O3 \
+	-fPIC \
 	-fpermissive
-CXXFLAGS += $(CFLAGS) -std=c++11 
-LDFLAGS += $(TARGET_ARCH) \
+JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11
+JUCE_LDFLAGS += $(TARGET_ARCH) \
 	-rdynamic \
 	-shared \
 	-fPIC \
 	$(empty)
-#LDFLAGS += -fvisibility=hidden
-LDFLAGS += \
+#JUCE_LDFLAGS += -fvisibility=hidden
+JUCE_LDFLAGS += \
 	-L$(BINDIR) \
 	-L$(LIBDIR) \
 	-L/usr/X11R6/lib/ \
@@ -79,9 +81,6 @@ LDFLAGS += \
 	$(empty)
 
 TARGET := libjuce.so
-BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
-#CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR) $(BINDIR) $(LIBDIR)
-CLEANCMD = rm -rf build
 
 OBJECTS=$(SOURCES:%.cpp=$(OBJDIR)/%.o)
 
@@ -92,16 +91,16 @@ $(OUTDIR)/$(TARGET): $(OBJECTS) $(RESOURCES)
 	- at mkdir -p $(BINDIR)
 	- at mkdir -p $(LIBDIR)
 	- at mkdir -p $(OUTDIR)
-	$(BLDCMD)
+	$(CXX) -o $@ $^ $(JUCE_LDFLAGS) $(LDFLAGS) $(TARGET_ARCH)
 
 $(OBJDIR):
 	mkdir -p "$@"
 
 $(OBJDIR)/%.o: %.cpp $(OBJDIR)
-	$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+	$(CXX) $(JUCE_CXXFLAGS) $(CXXFLAGS) -o "$@" -c "$<"
 
 clean:
 	@echo Cleaning juce_dll
-	$(CLEANCMD)
+	rm -rf build
 
 -include $(OBJECTS:%.o=%.d)

-- 
juce packaging