[SCM] juce/master: simplified library-inclusion

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 09bc958912aeb71618fdab41daef49cc9fb63a4c
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Thu Jan 21 20:25:35 2016 +0100

    simplified library-inclusion

diff --git a/debian/libbuilder/Makefile b/debian/libbuilder/Makefile
index f643d96..fab6cb7 100644
--- a/debian/libbuilder/Makefile
+++ b/debian/libbuilder/Makefile
@@ -28,24 +28,29 @@ SOURCES=juce_audio_basics.cpp \
 
 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
 
-
-FLAC_CFLAGS  := -DJUCE_INCLUDE_FLAC_CODE=0 $(shell pkg-config --cflags flac)
-FLAC_LDFLAGS := $(shell pkg-config --libs flac)
-
-JPEG_CFLAGS  := -DJUCE_INCLUDE_JPEGLIB_CODE=0 $(shell pkg-config --cflags libjpeg)
-JPEG_LDFLAGS := $(shell pkg-config --libs libjpeg)
-
-PNG_CFLAGS  := -DJUCE_INCLUDE_PNGLIB_CODE=0 -DPNG_SKIP_SETJMP_CHECK $(shell pkg-config --cflags libpng)
-PNG_LDFLAGS := $(shell pkg-config --libs libpng)
-
-VORBIS_CFLAGS  := -DJUCE_INCLUDE_OGGVORBIS_CODE=0 $(shell pkg-config --cflags ogg vorbis vorbisfile vorbisenc)
-VORBIS_LDFLAGS := $(shell pkg-config --libs ogg vorbis vorbisfile vorbisenc)
-
-ZLIB_CFLAGS  := -DJUCE_INCLUDE_ZLIB_CODE=0 $(shell pkg-config --cflags zlib)
-ZLIB_LDFLAGS := $(shell pkg-config --libs zlib)
-
-FREETYPE_CFLAGS  := $(shell pkg-config --cflags freetype2)
-FREETYPE_LDFLAGS := $(shell pkg-config --libs freetype2)
+JUCELIBS_CPPFLAGS :=
+JUCELIBS_CFLAGS   :=
+JUCELIBS_LIBS     :=
+
+JUCELIBS := $(JUCELIBS) flac
+JUCELIBS_CPPFLAGS := $(JUCELIBS_CPPFLAGS) -DJUCE_INCLUDE_FLAC_CODE=0
+JUCELIBS := $(JUCELIBS) libjpeg
+JUCELIBS_CPPFLAGS := $(JUCELIBS_CPPFLAGS) -DJUCE_INCLUDE_JPEGLIB_CODE=0
+JUCELIBS := $(JUCELIBS) libpng
+JUCELIBS_CPPFLAGS := $(JUCELIBS_CPPFLAGS) -DJUCE_INCLUDE_PNGLIB_CODE=0 -DPNG_SKIP_SETJMP_CHECK
+JUCELIBS := $(JUCELIBS) ogg vorbis vorbisfile vorbisenc
+JUCELIBS_CPPFLAGS := $(JUCELIBS_CPPFLAGS) -DJUCE_INCLUDE_OGGVORBIS_CODE=0
+JUCELIBS := $(JUCELIBS) zlib
+JUCELIBS_CPPFLAGS := $(JUCELIBS_CPPFLAGS) -DJUCE_INCLUDE_ZLIB_CODE=0
+JUCELIBS := $(JUCELIBS) freetype2
+JUCELIBS := $(JUCELIBS) gl
+JUCELIBS := $(JUCELIBS) x11 xext xinerama
+JUCELIBS := $(JUCELIBS) alsa
+JUCELIBS := $(JUCELIBS) libcurl
+
+
+JUCELIBS_CFLAGS := $(JUCELIBS_CFLAGS) $(shell pkg-config --cflags $(JUCELIBS))
+JUCELIBS_LIBS   := $(JUCELIBS_CLIBS)  $(shell pkg-config --libs   $(JUCELIBS))
 
 BINDIR := build
 LIBDIR := build
@@ -68,22 +73,15 @@ JUCE_CPPFLAGS := $(DEPFLAGS) \
 #	-D "JUCE_APP_VERSION_HEX=0x10000" \
 #	$(empty)
 JUCE_CPPFLAGS := $(JUCE_CPPFLAGS) \
-	-I /usr/include/freetype2 \
-	-I . \
+	$(JUCELIBS_CPPFLAGS) \
+	-I. \
 	$(empty)
 JUCE_CFLAGS += $(JUCE_CPPFLAGS) \
 	$(TARGET_ARCH) \
 	-O3 \
 	-fPIC \
 	-fpermissive
-JUCE_CFLAGS+= \
-	$(FLAC_CFLAGS) \
-	$(JPEG_CFLAGS) \
-	$(PNG_CFLAGS) \
-	$(VORBIS_CFLAGS) \
-	$(ZLIB_CFLAGS) \
-	$(FREETYPE_CFLAGS) \
-	$(empty)
+JUCE_CFLAGS+= $(JUCELIBS_CFLAGS)
 JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11
 JUCE_LDFLAGS += $(TARGET_ARCH) \
 	-rdynamic \
@@ -91,27 +89,12 @@ JUCE_LDFLAGS += $(TARGET_ARCH) \
 	-fPIC \
 	$(empty)
 #JUCE_LDFLAGS += -fvisibility=hidden
-JUCE_LDFLAGS+= \
-	$(FLAC_LDFLAGS) \
-	$(JPEG_LDFLAGS) \
-	$(PNG_LDFLAGS) \
-	$(VORBIS_LDFLAGS) \
-	$(ZLIB_LDFLAGS) \
-	$(FREETYPE_LDFLAGS) \
-	$(empty)
+JUCE_LDFLAGS+= $(JUCELIBS_LIBS)
 JUCE_LDFLAGS += \
 	-L$(BINDIR) \
 	-L$(LIBDIR) \
-	-L/usr/X11R6/lib/ \
-	-lGL \
-	-lX11 \
-	-lXext \
-	-lXinerama \
-	-lasound \
 	-ldl \
-	-lfreetype \
 	-lpthread \
-	-lcurl \
 	-lrt \
 	$(empty)
 
@@ -119,7 +102,7 @@ TARGET := libjuce.so
 
 OBJECTS=$(SOURCES:%.cpp=$(OBJDIR)/%.o)
 
-.PHONY: clean
+.PHONY: clean install test
 
 $(OUTDIR)/$(TARGET): $(OBJECTS) $(RESOURCES)
 	@echo Linking juce_dll

-- 
juce packaging