[SCM] juce/master: build Introjucer as part of libbuilder

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7a29189e0ac77a4964e055fca632230b2e53371a
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Sat Jan 30 15:56:49 2016 +0100

    build Introjucer as part of libbuilder
    
    this makes it somewhat easier to pass in hardening flags.

diff --git a/debian/libbuilder/Makefile b/debian/libbuilder/Makefile
index 1bfce9e..a3b4ab9 100644
--- a/debian/libbuilder/Makefile
+++ b/debian/libbuilder/Makefile
@@ -7,6 +7,7 @@ SONAME=0.0.0
 SHORTSONAME=0
 TARGET := libjuce.so
 
+
 # (this disables dependency generation if multiple architectures are set)
 DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)
 
@@ -15,6 +16,7 @@ empty=
 JUCE_PATH=../..
 MODULES_PATH=$(JUCE_PATH)/modules
 DEMO_PATH       = $(JUCE_PATH)/examples/Demo/Builds/Linux/
+INTROJUCER_PATH = $(JUCE_PATH)/extras/Introjucer/Builds/Linux/
 
 SOURCES=juce_audio_basics.cpp \
 	juce_audio_devices.cpp \
@@ -103,7 +105,9 @@ JUCE_LDFLAGS += \
 
 OBJECTS=$(SOURCES:%.cpp=$(OBJDIR)/%.o)
 
-.PHONY: clean install install-lib install-headers install-pkgconfig test
+.PHONY: all clean install install-lib install-headers install-pkgconfig test introjucer
+
+all: $(OUTDIR)/$(TARGET) introjucer
 
 $(OUTDIR)/$(TARGET): $(OBJECTS) $(RESOURCES)
 	@echo Linking juce_dll
@@ -119,6 +123,7 @@ clean:
 	rm -rf build
 	rm -rf juce.pc
 	make -C $(DEMO_PATH) clean
+	make -C $(INTROJUCER_PATH) clean
 
 install-lib: $(OUTDIR)/$(TARGET)
 	@echo Installing juce_dll
@@ -143,6 +148,9 @@ install: install-headers install-lib install-pkgconfig
 test:
 	make -C $(DEMO_PATH)
 
+introjucer: $(OUTDIR)/$(TARGET)
+	make -C $(INTROJUCER_PATH) CONFIG=Release CPPFLAGS="$(CPPFLAGS) $(JUCELIBS_CPPFLAGS)" CFLAGS="$(CFLAGS) $(JUCELIBS_CFLAGS)" LDFLAGS="$(LDFLAGS) $(JUCELIBS_LIBS)"
+
 juce.pc: juce.pc.in
 	sed \
 		-e 's|@prefix@|$(prefix)|g' \
diff --git a/debian/rules b/debian/rules
index 913d812..10a4d44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,9 +25,7 @@ DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(cdbs_make_curdestdir) prefix=/usr li
 build/libjuce-doc::
 	cd doxygen && doxygen Doxyfile
 
-build/libjuce-utils::
-	make -C extras/Introjucer/Builds/Linux/ Release
-
 clean::
 	rm -rf doxygen/doc
+	rm -rf extras/Introjucer/Builds/Linux/build
 

-- 
juce packaging