Subject: Small improvements to the buildsystem.
Add -g to CFLAGS.
Origin: Debian
Reviewed-by: Alessio Treglia <alessio@debian.org>
Last-Update: 2011-03-04
Forwarded: no
---
Makefile.in | 17 ++++++++---------
configure | 2 +-
configure.in | 2 +-
meschach/makefile.in | 2 +-
4 files changed, 11 insertions(+), 12 deletions(-)
--- gwc.orig/Makefile.in
+++ gwc/Makefile.in
@@ -1,16 +1,15 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
-BINDIR = @bindir@
-DATADIR = @datadir@
-DATAROOTDIR = @datarootdir@
-LIBDIR = @libdir@
-SYSCONFDIR = @sysconfdir@
+BINDIR = $(DESTDIR)/@bindir@
+DATADIR = $(DESTDIR)/@datadir@
+DATAROOTDIR = $(DESTDIR)/@datarootdir@
+LIBDIR = $(DESTDIR)/@libdir@
APPNAME = gnome_wave_cleaner
GNOME = @GNOME_BASE@
pixmapdir = $(DATADIR)/pixmaps
-HELPDIR = ${prefix}/$(GNOME)/share/gnome/help/$(APPNAME)
+HELPDIR = $(DESTDIR)/$(GNOME)/share/gnome/help/$(APPNAME)
HELPDIRC = $(HELPDIR)/C
DOCDIR = $(DATADIR)/doc/gwc
@@ -23,7 +22,7 @@ DOCDIR = $(DATADIR)/doc/gwc
CONFIGDIR = /$(APPNAME)/config/
DEFS = -DDATADIR=\"$(DATADIR)\" -DLIBDIR=\"$(LIBDIR)\" -DAPPNAME=\"$(APPNAME)\" @ALSADEF@ @PAHDR@ @FFTWHDR@ @FFTWPREC@ @OGGHDR@ @MP3HDR@
-CFLAGS = -D_FILE_OFFSET_BITS=64 -Wall -O6 @GNOMEUI_CFLAGS@ @SNDFILE_CFLAGS@
+CFLAGS = -D_FILE_OFFSET_BITS=64 -Wall -g -O6 @GNOMEUI_CFLAGS@ @SNDFILE_CFLAGS@
LIBS= meschach.a @GNOMEUI_LIBS@ @SNDFILE_LIBS@ @ALSALIB@ @PALIB@ @FFTWLIB@ @OGGLIB@ @MP3LIB@ -lm
@@ -47,7 +46,7 @@ EFENCE =
all : gwc
gwc : $(OBJS) meschach.a
- $(CC) $(OBJS) $(EFENCE) $(LFLAGS) $(LIBS) -o gwc
+ $(CC) $(LDFLAGS) $(OBJS) $(EFENCE) $(LFLAGS) $(LIBS) -o gwc
audio_device.o : audio_device.c audio_alsa.c audio_oss.c audio_osx.c audio_pa.c Makefile
$(COMPILE) -c audio_device.c
@@ -60,7 +59,7 @@ install : gwc
install -d $(DOCDIR)
install -d $(pixmapdir)
install -d $(HELPDIRC)
- install -p -s $(BINFILES) $(BINDIR)
+ install -p $(BINFILES) $(BINDIR)/$(APPNAME)
install -p -m 0644 $(DOCFILES) $(DOCDIR)
for hf in $(HELPFILES) ; do install -p -m 0644 $(HELPFILESSRCD)/$$hf $(HELPDIRC) ; done
install -p -m 0644 $(pixmap_DATA) $(pixmapdir)
--- gwc.orig/configure
+++ gwc/configure
@@ -3169,7 +3169,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
UNAME_MACHINE=`uname -m`
-#GNOME_BASE=`gnome-config --prefix`
+GNOME_BASE=`pkg-config --variable=prefix gtk+-2.0`
--- gwc.orig/configure.in
+++ gwc/configure.in
@@ -27,7 +27,7 @@ AC_SUBST(UNAME_MACHINE)
AC_SUBST(GNOME_BASE)
UNAME_MACHINE=`uname -m`
-#GNOME_BASE=`gnome-config --prefix`
+GNOME_BASE=`pkg-config --variable=prefix gtk+-2.0`
dnl Checks for libraries.
--- gwc.orig/meschach/makefile.in
+++ gwc/meschach/makefile.in
@@ -16,7 +16,7 @@ LIBS = @LIBS@
RANLIB = @RANLIB@
-CFLAGS = -O6
+CFLAGS = -g -O6
.c.o: