[SCM] pd-iem_ambi/master: fix makefile
zmoelnig-guest at users.alioth.debian.org
zmoelnig-guest at users.alioth.debian.org
Tue Feb 8 16:30:44 UTC 2011
The following commit has been merged in the master branch:
commit 927c802c7167673ce7b701d2320612f8947d67df
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date: Tue Feb 8 17:29:07 2011 +0100
fix makefile
diff --git a/debian/patches/fix-makeflags.patch b/debian/patches/fix-makeflags.patch
new file mode 100644
index 0000000..ee92263
--- /dev/null
+++ b/debian/patches/fix-makeflags.patch
@@ -0,0 +1,54 @@
+Author: IOhannes m zmölnig
+Description: use specific FLAG-names (e.g. PD_LDFLAGS) rather than the ones that
+are overwritten by the build-system (e.g. LDFLAGS)
+--- pd-iem_ambi.orig/src/makefile_linux
++++ pd-iem_ambi/src/makefile_linux
+@@ -3,20 +3,22 @@
+ .SUFFIXES: .pd_linux
+
+ PDSOURCE?=/usr/local/src/pd/src
+-INCLUDE = -I. -I$(PDSOURCE)
++PD_INCLUDE = -I. -I$(PDSOURCE)
+
+-LDFLAGS = -export-dynamic -shared
++PD_LDFLAGS = -export-dynamic -shared
+ LIB = -ldl -lm -lpthread
+
+ STRIP=strip
+
+ #select either the DBG and OPT compiler flags below:
+
+-CFLAGS = -DPD -DUNIX \
++PD_CFLAGS = -DPD -DUNIX \
+ -W -Wno-unused -Wno-parentheses -Wno-switch \
+- -O6 -funroll-loops -fomit-frame-pointer -fno-strict-aliasing \
++ -funroll-loops -fomit-frame-pointer -fno-strict-aliasing \
+ -DDL_OPEN -fPIC
+
++CFLAGS="-O6"
++
+ SYSTEM = $(shell uname -m)
+
+ # the sources
+@@ -39,17 +41,17 @@
+ #
+
+ clean:
+- -rm ../$(TARGET)
+- -rm *.o
++ -rm -f ../$(TARGET)
++ -rm -f *.o
+
+ all: $(OBJ)
+ @echo :: $(OBJ)
+- $(LD) $(LDFLAGS) -o $(TARGET) *.o $(LIB)
++ $(LD) $(PD_LDFLAGS) $(LDFLAGS) -o $(TARGET) *.o $(LIB)
+ $(STRIP) --strip-unneeded $(TARGET)
+ mv $(TARGET) ..
+
+ $(OBJ) : %.o : %.c
+- $(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $*.c
++ $(CC) $(PD_CFLAGS) $(CFLAGS) $(PD_INCLUDE) $(INCLUDE) -c -o $*.o $*.c
+
+
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c305c4a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-makeflags.patch
--
pd-iem_ambi packaging
More information about the pkg-multimedia-commits
mailing list