summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2006-10-17 21:16:33 +0000
committerRoss Burton <rburton@src.gnome.org>2006-10-17 21:16:33 +0000
commit19b8e723008c9b3d6af3d4a3b1fa69e0c9e2951b (patch)
tree728521158377ccfce32c769ab93677528b742e7d /src
parent87e4b4ec9d3157cde1e23768eaacedb6ca371f4f (diff)
Rename and add version field for bug-buddy.
2006-10-17 Ross Burton <ross@burtonini.com> * data/sound-juicer.desktop.in: * data/sound-juicer.desktop.in.in: * po/POTFILES.in: Rename and add version field for bug-buddy. * autogen.sh: * configure.in: * Makefile.am: * data/Makefile.am: * libjuicer/Makefile.am: * src/Makefile.am: * tests/Makefile.am: Port to automake 1.9. * .cvsignore: * help/sound-juicer/*/.cvsignore: * po/.cvsignore: Update. Thanks to Christian Persch (#357682).
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am80
1 files changed, 49 insertions, 31 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index bf02f7b..1a8e307 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,31 +1,5 @@
-# General compiler flags
-AM_CFLAGS = -export-dynamic @WARN_CFLAGS@
-
-# General CPP flags. When I can demand automake 1.8, this can become
-# sound_juicer_CPPFLAGS.
-AM_CPPFLAGS = \
- -I$(top_srcdir)/libjuicer \
- @DISABLE_DEPRECATED_CFLAGS@ \
- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- -DDATADIR=\""$(datadir)"\" \
- -DPREFIX=\""$(prefix)"\" \
- -DLIBDIR=\""$(libdir)"\" \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DPIXMAPDIR=\""$(datadir)/pixmaps"\" \
- -DPKGDATADIR=\""$(datadir)/sound-juicer"\" \
- @GSTREAMER_CFLAGS@ @MEDIA_PROFILES_CFLAGS@ @BURN_CFLAGS@ @UI_CFLAGS@
-
-if HAVE_TAGLIB
-AM_CPPFLAGS += @TAGLIB_CFLAGS@
-endif
-
-# We always build Sound Juicer
bin_PROGRAMS = sound-juicer
-if HAVE_TAGLIB
-ID3MUX_FILES = gsttaglib.cc gsttaglib.h
-endif
-
sound_juicer_SOURCES = \
dummy.cpp \
sound-juicer.h \
@@ -42,13 +16,57 @@ sound_juicer_SOURCES = \
gconf-bridge.c \
bacon-volume.c \
bacon-volume.h \
- $(BACON_FILES) \
- $(ID3MUX_FILES)
+ $(BACON_FILES)
+
+sound_juicer_CPPFLAGS = \
+ -I$(top_srcdir)/libjuicer \
+ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+ -DDATADIR=\""$(datadir)"\" \
+ -DPREFIX=\""$(prefix)"\" \
+ -DLIBDIR=\""$(libdir)"\" \
+ -DSYSCONFDIR=\""$(sysconfdir)"\" \
+ -DPIXMAPDIR=\""$(datadir)/pixmaps"\" \
+ -DPKGDATADIR=\""$(datadir)/sound-juicer"\" \
+ $(DISABLE_DEPRECATED) \
+ $(AM_CPPFLAGS)
+
+sound_juicer_CFLAGS = \
+ $(GSTREAMER_CFLAGS) \
+ $(MEDIA_PROFILES_CFLAGS) \
+ $(BURN_CFLAGS) \
+ $(UI_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CFLAGS)
+
+sound_juicer_CXXFLAGS = \
+ $(GSTREAMER_CFLAGS) \
+ $(MEDIA_PROFILES_CFLAGS) \
+ $(BURN_CFLAGS) \
+ $(UI_CFLAGS) \
+ $(WARN_CXXFLAGS) \
+ $(AM_CXXFLAGS)
+
+sound_juicer_LDADD = \
+ $(top_builddir)/libjuicer/libjuicer.la \
+ $(MEDIA_PROFILES_LIBS) \
+ $(GSTREAMER_LIBS) \
+ $(BURN_LIBS) \
+ $(UI_LIBS)
+
+sound_juicer_LDFLAGS = \
+ $(AM_LDFLAGS)
-sound_juicer_LDADD = $(top_builddir)/libjuicer/libjuicer.la
-sound_juicer_LDFLAGS = @MEDIA_PROFILES_LIBS@ @GSTREAMER_LIBS@ @BURN_LIBS@ @UI_LIBS@
if HAVE_TAGLIB
-sound_juicer_LDFLAGS += @TAGLIB_LIBS@ -lgsttag-0.10
+sound_juicer_SOURCES += \
+ gsttaglib.cc \
+ gsttaglib.h
+
+sound_juicer_CXXFLAGS += \
+ $(TAGLIB_CFLAGS)
+
+sound_juicer_LDADD += \
+ $(TAGLIB_LIBS) \
+ -lgsttag-0.10
endif
BACON_DIR=$(srcdir)/../../libbacon/src/