[SCM] juce/master: cleaning up libbuilder Makefile

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Thu Jan 21 16:34:05 UTC 2016


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

    cleaning up libbuilder Makefile

diff --git a/debian/libbuilder/Makefile b/debian/libbuilder/Makefile
index 3bebd2f..8970791 100644
--- a/debian/libbuilder/Makefile
+++ b/debian/libbuilder/Makefile
@@ -42,20 +42,25 @@ CPPFLAGS := $(DEPFLAGS) \
 	-D "NDEBUG=1" \
 	-D "DEBUG=0" \
 	-D "JUCE_DLL_BUILD=1" \
-	-D "JUCER_LINUX_MAKE_6D53C8B4=1" \
-	-D "JUCE_APP_VERSION=1.0.0" \
-	-D "JUCE_APP_VERSION_HEX=0x10000" \
+	$(empty)
+#CPPFLAGS := $(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 \
 	-I /usr/include/freetype2 \
-	-I ../../JuceLibraryCode \
-	-I ../../../../juce
+	-I . \
+	$(empty)
 CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -fPIC \
 	-fpermissive
 CXXFLAGS += $(CFLAGS) -std=c++11 
 LDFLAGS += $(TARGET_ARCH) \
 	-rdynamic \
 	-shared \
-	-fPIC
+	-fPIC \
+	$(empty)
 #LDFLAGS += -fvisibility=hidden
 LDFLAGS += \
 	-L$(BINDIR) \
@@ -70,7 +75,8 @@ LDFLAGS += \
 	-lfreetype \
 	-lpthread \
 	-lcurl \
-	-lrt
+	-lrt \
+	$(empty)
 
 TARGET := libjuce.so
 BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)

-- 
juce packaging



More information about the pkg-multimedia-commits mailing list