From ced4624dae15ead098995a151440c1d80d355a44 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Wed, 5 Oct 2011 05:12:21 +0000
Subject: enable setting STRIP from the global package-specific Makefile and
 set STRIP=echo to keep debug symbols

svn path=/trunk/; revision=15506
---
 packages/Makefile            | 3 ++-
 packages/darwin_app/Makefile | 7 ++++++-
 packages/linux_make/Makefile | 7 ++++++-
 packages/win32_inno/Makefile | 7 ++++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'packages')

diff --git a/packages/Makefile b/packages/Makefile
index 478661a1..a9897257 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -62,7 +62,8 @@ DEST_PATHS = BUILDLAYOUT_DIR=$(BUILDLAYOUT_DIR) \
 				libpddir=$(libpddir) \
 				pkglibdir=$(libpddir) \
 				OPT_CFLAGS="$(OPT_CFLAGS)" \
-				UNAME=$(UNAME)
+				UNAME=$(UNAME) \
+				STRIP="$(STRIP)"
 
 
 #==============================================================================#
diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile
index 160a27e2..aa205e2c 100644
--- a/packages/darwin_app/Makefile
+++ b/packages/darwin_app/Makefile
@@ -23,6 +23,10 @@ WISH_NAME := $(shell ( test -d $(WISH_SOURCE)/Wish.app && echo Wish) \
 WISH = "$(WISH_SOURCE)/$(WISH_NAME).app"
 WISH_CONTENTS = "$(WISH)/Contents"
 
+# to control whether the debug symbols are kept
+#STRIP = strip -x
+STRIP = echo
+
 # CPU-specific gleaned from:
 # http://developer.apple.com/releasenotes/DeveloperTools/RN-GCC4/
 # http://hpc.sourceforge.net/
@@ -54,7 +58,8 @@ DEST_PATHS = BUILDLAYOUT_DIR=$(BUILDLAYOUT_DIR) \
 				DESTDIR=$(DESTDIR) \
 				OPT_CFLAGS="$(OPT_CFLAGS)" \
 				FAT_FLAGS="$(FAT_FLAGS)" \
-				UNAME=$(UNAME)
+				UNAME=$(UNAME) \
+				STRIP="$(STRIP)"
 
 all:
 	$(MAKE) -C $(packages_src) $(DEST_PATHS)
diff --git a/packages/linux_make/Makefile b/packages/linux_make/Makefile
index e6033d6c..d34ca7d6 100755
--- a/packages/linux_make/Makefile
+++ b/packages/linux_make/Makefile
@@ -28,6 +28,10 @@ else
   prefix = /usr/local
 endif
 
+# to control whether the debug symbols are kept
+#STRIP = strip --strip-unneeded -R .note -R .comment
+STRIP = echo
+
 OPT_CFLAGS = -g
 
 TARGET_PLATFORM := $(shell uname -m)
@@ -52,7 +56,8 @@ DEST_PATHS = BUILDLAYOUT_DIR=$(BUILDLAYOUT_DIR) \
 				DESTDIR=$(DESTDIR) \
 				prefix=$(prefix) \
 				OPT_CFLAGS="$(OPT_CFLAGS)" \
-				UNAME=$(UNAME)
+				UNAME=$(UNAME) \
+				STRIP=$(STRIP)
 
 all: 	
 	$(MAKE) -C $(packages_src) $(DEST_PATHS)
diff --git a/packages/win32_inno/Makefile b/packages/win32_inno/Makefile
index a31236ae..0dc5a302 100755
--- a/packages/win32_inno/Makefile
+++ b/packages/win32_inno/Makefile
@@ -13,6 +13,10 @@ BUILDLAYOUT_DIR = $(cvs_root_dir)/packages
 
 include $(BUILDLAYOUT_DIR)/Makefile.buildlayout
 
+# to control whether the debug symbols are kept
+#STRIP = strip --strip-unneeded -R .note -R .comment
+STRIP = echo
+
 OPT_CFLAGS = -g
 
 # compile for pentium4 so we can use SSE2
@@ -27,7 +31,8 @@ DEST_PATHS = BUILDLAYOUT_DIR=$(BUILDLAYOUT_DIR) \
 				DESTDIR=$(DESTDIR) \
 				prefix=$(prefix) \
 				OPT_CFLAGS="$(OPT_CFLAGS)" \
-				UNAME=$(UNAME)
+				UNAME=$(UNAME) \
+				STRIP="$(STRIP)"
 
 PD_INNO_SETUP = pd-inno.iss
 
-- 
cgit v1.2.1