[SCM] pd-iem_ambi/master: more fixes for the makefile

[zmoelnig-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0ad7fb15285e4edc511755cede9df1a61cead38e
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Tue Feb 8 17:38:06 2011 +0100

    more fixes for the makefile

diff --git a/debian/patches/fix-makeflags.patch b/debian/patches/fix-makefile.patch
similarity index 86%
rename from debian/patches/fix-makeflags.patch
rename to debian/patches/fix-makefile.patch
index ee92263..cd6037f 100644
--- a/debian/patches/fix-makeflags.patch
+++ b/debian/patches/fix-makefile.patch
@@ -1,9 +1,10 @@
 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)
+are overwritten by the build-system (e.g. LDFLAGS);
+remove unused things like STRIP
 --- pd-iem_ambi.orig/src/makefile_linux
 +++ pd-iem_ambi/src/makefile_linux
-@@ -3,20 +3,22 @@
+@@ -3,20 +3,20 @@
  .SUFFIXES: .pd_linux
  
  PDSOURCE?=/usr/local/src/pd/src
@@ -14,8 +15,8 @@ are overwritten by the build-system (e.g. LDFLAGS)
 +PD_LDFLAGS = -export-dynamic -shared
  LIB = -ldl -lm -lpthread
  
- STRIP=strip
- 
+-STRIP=strip
+-
  #select either the DBG and OPT compiler flags below:
  
 -CFLAGS = -DPD -DUNIX \
@@ -30,7 +31,7 @@ are overwritten by the build-system (e.g. LDFLAGS)
  SYSTEM = $(shell uname -m)
  
  # the sources
-@@ -39,17 +41,17 @@
+@@ -39,17 +39,16 @@
  #
  
  clean:
@@ -42,8 +43,8 @@ are overwritten by the build-system (e.g. LDFLAGS)
  all: $(OBJ)
  	@echo :: $(OBJ)
 -	$(LD) $(LDFLAGS) -o $(TARGET) *.o $(LIB)
+-	$(STRIP) --strip-unneeded $(TARGET)
 +	$(LD) $(PD_LDFLAGS) $(LDFLAGS) -o $(TARGET) *.o $(LIB)
- 	$(STRIP) --strip-unneeded $(TARGET)
  	mv $(TARGET) ..
  
  $(OBJ) : %.o : %.c
diff --git a/debian/patches/series b/debian/patches/series
index c305c4a..c6d2ef7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-fix-makeflags.patch
+fix-makefile.patch

-- 
pd-iem_ambi packaging