1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58
|
Index: gnusound-0.7.5/Makefile.in
===================================================================
--- gnusound-0.7.5.orig/Makefile.in 2009-04-01 15:02:49.000000000 +0200
+++ gnusound-0.7.5/Makefile.in 2009-04-01 15:07:08.000000000 +0200
@@ -22,7 +22,8 @@
-DSYSCONFDIR="${sysconfdir}" \
-DPREFIX="${prefix}" \
-DDATADIR="${datadir}"
-export LDFLAGS=@LDFLAGS@ @LIBS@
+export MOD_LDFLAGS
+export MAINT_LDFLAGS=@LDFLAGS@ @LIBS@
name=@PACKAGE@
version=@VERSION@
@@ -181,7 +182,7 @@
echo '$(CFLAGS)' > .cflags
.ldflags: Makefile
- echo '$(LDFLAGS)' > .ldflags
+ echo '$(MAINT_LDFLAGS)' > .ldflags
mods:
$(MAKE) -C modules
Index: gnusound-0.7.5/modules/Makefile.in
===================================================================
--- gnusound-0.7.5.orig/modules/Makefile.in 2009-04-01 15:02:49.000000000 +0200
+++ gnusound-0.7.5/modules/Makefile.in 2009-04-01 15:02:49.000000000 +0200
@@ -29,6 +29,7 @@
moduledir=$(libdir)/modules
moduledatadir=$(datadir)/$(name)/modules
gnusounddir=@GNUSOUNDDIR@
+export MOD_LDFLAGS
owner_user ?= root
owner_group ?= root
@@ -37,7 +38,7 @@
obj=$(addsuffix .so, $(basename $(src)))
flags=$(addprefix ., $(addsuffix .cflags, $(basename $(src))))
clean_files=$(obj) *.bak
-veryclean_files=.*.cflags *~ \#*
+veryclean_files=.*.cflags .ldflags *~ \#*
module_files=$(shell ls *.glade *.xpm)
ifeq (@HAVE_GNOME2@,yes)
@@ -58,8 +59,11 @@
.%.cflags:
@touch $@
-%.so : %.c
- $(CC) `cat $(gnusounddir)/.cflags` -I$(gnusounddir)/src -I$(gnusounddir)/src/$(gtk) -fPIC -shared $< -o $@ `cat .$(basename $@).cflags`
+.ldflags: Makefile
+ echo '$(MOD_LDFLAGS)' > .ldflags
+
+%.so : %.c .ldflags
+ $(CC) `cat $(gnusounddir)/.cflags` -I$(gnusounddir)/src -I$(gnusounddir)/src/$(gtk) -fPIC -shared $< -o $@ `cat .ldflags` `cat .$(basename $@).cflags`
install:
mkdir -p $(moduledir) $(moduledatadir)
|