summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFilippo Giunchedi <filippo@esaurito.net>2009-11-06 15:24:08 (GMT)
committer Filippo Giunchedi <filippo@esaurito.net>2009-11-08 13:03:57 (GMT)
commit09cc62cc5e97ae8b660be96b746941599e17e5ce (patch)
tree5ce9e749e932ed8958ec308b3b25656f475e6d23
parent7965f88d165680688851b2f1a2d5596584987de8 (diff)
non-recursive makefile for src/ and src/gtkgui2
-rw-r--r--Makefile.am134
-rw-r--r--configure.ac8
-rw-r--r--intl/Makefile.am0
-rw-r--r--lib/Makefile.am2
-rw-r--r--src/Makefile.am60
-rw-r--r--src/gtkgui2/Makefile.am29
6 files changed, 136 insertions, 97 deletions
diff --git a/Makefile.am b/Makefile.am
index d94a33c..82bdfd0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ if BUILD_DOC
DOCSDIR = doc
endif
-SUBDIRS = lib src $(DOCSDIR)
+SUBDIRS = lib/libmpeg src/ncursesgui $(DOCSDIR)
dist_docs_DATA = README COPYING AUTHORS NEWS KNOWN-BUGS ChangeLog TODO USAGE
docsdir = ${prefix}/share/doc/${PACKAGE}
@@ -13,3 +13,135 @@ ACLOCAL_AMFLAGS = -I m4
# FIXME po should be properly gettexited
EXTRA_DIST = autogen.sh po utils
+
+### src/
+bin_PROGRAMS = src/muse
+src_muse_SOURCES = \
+ src/muse.cpp \
+ src/jmixer.cpp \
+ src/audioproc.cpp \
+ src/inchannels.cpp \
+ src/decoder.cpp \
+ src/dec_mp3.cpp \
+ src/dec_ogg.cpp \
+ src/dec_snd.cpp \
+ src/dec_jack.cpp \
+ src/outchannels.cpp \
+ src/out_vorbis.cpp \
+ src/out_lame.cpp \
+ src/pipe.cpp \
+ src/shouter.cpp \
+ src/linklist.cpp \
+ src/playlist.cpp \
+ src/jutils.cpp \
+ src/radiosched.cpp \
+ src/httpstream.cpp \
+ src/gui.cpp \
+ src/dev_sound.cpp \
+ src/lame_wrap.cpp
+
+src_muse_CXXFLAGS = \
+ -I$(top_srcdir)/src \
+ $(DARWIN_CFLAGS) \
+ $(GLIB2_CFLAGS) \
+ $(GUI_FLAGS) \
+ $(JACK_CFLAGS) \
+ $(LIBMPEG_CFLAGS) \
+ $(OGG_CFLAGS) \
+ $(PORTAUDIO_CFLAGS) \
+ $(SAMPLERATE_CFLAGS) \
+ $(SHOUT_CFLAGS) \
+ $(VORBIS_CFLAGS)
+
+src_muse_LDADD = \
+ -lpthread \
+ -ldl \
+ $(DARWIN_LIBS) \
+ $(GLIB2_LIBS) \
+ $(GUI_LIBS) \
+ $(JACK_LIBS) \
+ $(LIBMPEG_LIBS) \
+ $(M_LIBS) \
+ $(OGG_LIBS) \
+ $(PORTAUDIO_LIBS) \
+ $(SAMPLERATE_LIBS) \
+ $(SHOUT_LIBS) \
+ $(SNDFILE_LIBS) \
+ $(VORBIS_LIBS)
+
+noinst_HEADERS = \
+ src/audioproc.h \
+ src/dec_jack.h \
+ src/dec_mp3.h \
+ src/decoder.h \
+ src/dec_ogg.h \
+ src/dec_snd.h \
+ src/dev_sound.h \
+ src/generic.h \
+ src/gui.h \
+ src/httpstream.h \
+ src/inchannels.h \
+ src/jmixer.h \
+ src/jutils.h \
+ src/lame_wrap.h \
+ src/linklist.h \
+ src/outchannels.h \
+ src/out_lame.h \
+ src/out_vorbis.h \
+ src/pipe.h \
+ src/playlist.h \
+ src/profile.h \
+ src/radiosched.h \
+ src/resarr160to441.h \
+ src/resarr320to441.h \
+ src/shouter.h \
+ src/xmlprofile.h
+
+EXTRA_DIST += src/vumeter.c src/xmlprofile.cpp src/profile.cpp
+
+
+## src/gtkgui2
+noinst_LIBRARIES = src/gtkgui2/libnightolo2.a
+src_gtkgui2_libnightolo2_a_SOURCES = \
+ src/gtkgui2/about.cpp \
+ src/gtkgui2/docking.cpp \
+ src/gtkgui2/encoder.cpp \
+ src/gtkgui2/filedump.cpp \
+ src/gtkgui2/gchan.cpp \
+ src/gtkgui2/gchan_events.cpp \
+ src/gtkgui2/gradiosched.cpp \
+ src/gtkgui2/gtk2_gui.cpp \
+ src/gtkgui2/gtkdial.cpp \
+ src/gtkgui2/ice.cpp \
+ src/gtkgui2/listpack.cpp \
+ src/gtkgui2/musegtk.cpp \
+ src/gtkgui2/utils.cpp \
+ src/gtkgui2/vumeters.cpp \
+ src/gtkgui2/xmlprofile.cpp
+
+# FIXME why xmlprofile.h is duplicated into src/gtkgui2 and src/ ?
+src_gtkgui2_libnightolo2_a_CXXFLAGS = \
+ -DLOCALEDIR=\"$(localedir)\" \
+ $(GTK2_CFLAGS) \
+ -I$(top_srcdir)/src/gtkgui2 \
+ -I$(top_srcdir)/src
+
+noinst_HEADERS += \
+ src/gtkgui2/about.h \
+ src/gtkgui2/docking.h \
+ src/gtkgui2/encoder.h \
+ src/gtkgui2/filedump.h \
+ src/gtkgui2/gchan_events.h \
+ src/gtkgui2/gchan.h \
+ src/gtkgui2/gen.h \
+ src/gtkgui2/gradiosched.h \
+ src/gtkgui2/gtk2_gui.h \
+ src/gtkgui2/gtkdial.h \
+ src/gtkgui2/ice.h \
+ src/gtkgui2/listpack.h \
+ src/gtkgui2/musegtk.h \
+ src/gtkgui2/utils.h \
+ src/gtkgui2/vumeters.h \
+ src/gtkgui2/xmlprofile.h
+
+EXTRA_DIST += src/gtkgui2/xpm2
diff --git a/configure.ac b/configure.ac
index 83bd93d..23db4d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ dnl ==============================================================
dnl Setup for automake
dnl ==============================================================
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
# never run autotools and configure automatically
@@ -265,13 +265,13 @@ GUI_LIBS=""
GUI_DIRS=""
GUI_FLAGS=""
if test "$want_ncurses_gui" = "yes"; then
- GUI_LIBS="$GUI_LIBS ncursesgui/librubik.a ncursesgui/libcdk/libcdk.a"
+ GUI_LIBS="$GUI_LIBS \$(top_builddir)/src/ncursesgui/librubik.a \$(top_builddir)/src/ncursesgui/libcdk/libcdk.a"
GUI_DIRS="$GUI_DIRS ncursesgui"
GUI_FLAGS="$GUI_FLAGS -I\$(top_srcdir)/src/ncursesgui"
fi
if test "${want_gtk2_gui}" = "yes"; then
- GUI_LIBS="$GUI_LIBS $GTK2_LIBS gtkgui2/libnightolo2.a"
+ GUI_LIBS="$GUI_LIBS $GTK2_LIBS \$(top_builddir)/src/gtkgui2/libnightolo2.a"
GUI_DIRS="$GUI_DIRS gtkgui2"
GUI_FLAGS="$GUI_FLAGS $GTK2_CFLAGS"
@@ -417,8 +417,6 @@ Makefile
lib/Makefile
lib/libmpeg/Makefile
lib/portaudio/Makefile
-src/Makefile
-src/gtkgui2/Makefile
src/ncursesgui/Makefile
src/ncursesgui/libcdk/Makefile
doc/Makefile
diff --git a/intl/Makefile.am b/intl/Makefile.am
deleted file mode 100644
index e69de29..0000000
--- a/intl/Makefile.am
+++ /dev/null
diff --git a/lib/Makefile.am b/lib/Makefile.am
deleted file mode 100644
index c243ddd..0000000
--- a/lib/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = libmpeg @PORTAUDIO_DIRS@
-
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 74ab89d..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,60 +0,0 @@
-SUBDIRS = @GUI_DIRS@
-
-DIST_SUBDIRS = gtkgui2 ncursesgui
-
-MUSE_CFLAGS = @GUI_FLAGS@ @JACK_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@ \
- @GLIB2_CFLAGS@ @DARWIN_CFLAGS@ @PORTAUDIO_CFLAGS@ @SHOUT_CFLAGS@ \
- @VORBIS_CFLAGS@ @OGG_CFLAGS@ @SAMPLERATE_CFLAGS@ @LIBMPEG_CFLAGS@
-
-AM_CFLAGS = $(MUSE_CFLAGS)
-AM_CXXFLAGS = $(MUSE_CFLAGS)
-
-EXTRA_DIST = vumeter.c xmlprofile.cpp profile.cpp
-
-noinst_HEADERS = audioproc.h dec_jack.h dec_mp3.h decoder.h dec_ogg.h dec_snd.h \
- dev_sound.h generic.h gui.h httpstream.h inchannels.h jmixer.h jutils.h \
- linklist.h outchannels.h out_lame.h out_vorbis.h pipe.h playlist.h profile.h \
- radiosched.h resarr160to441.h resarr320to441.h shouter.h xmlprofile.h \
- lame_wrap.h
-
-bin_PROGRAMS = muse
-
-muse_SOURCES = \
- muse.cpp \
- jmixer.cpp \
- audioproc.cpp \
- inchannels.cpp \
- decoder.cpp \
- dec_mp3.cpp \
- dec_ogg.cpp \
- dec_snd.cpp \
- dec_jack.cpp \
- outchannels.cpp \
- out_vorbis.cpp \
- out_lame.cpp \
- pipe.cpp \
- shouter.cpp \
- linklist.cpp \
- playlist.cpp \
- jutils.cpp \
- radiosched.cpp \
- httpstream.cpp \
- gui.cpp \
- dev_sound.cpp \
- lame_wrap.cpp
-
-muse_LDADD = \
- -lpthread \
- -ldl \
- @SAMPLERATE_LIBS@ \
- @M_LIBS@ \
- @OGG_LIBS@ \
- @VORBIS_LIBS@ \
- @GUI_LIBS@ \
- @SNDFILE_LIBS@ \
- @GLIB2_LIBS@ \
- @JACK_LIBS@ \
- @DARWIN_LIBS@ \
- @PORTAUDIO_LIBS@ \
- @LIBMPEG_LIBS@ \
- @SHOUT_LIBS@
diff --git a/src/gtkgui2/Makefile.am b/src/gtkgui2/Makefile.am
deleted file mode 100644
index 2ed0954..0000000
--- a/src/gtkgui2/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-localedir = $(datadir)/locale
-DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-
-INCLUDES = -I. -I../.. -I$(top_srcdir)/src @GTK2_CFLAGS@ -I/sw/include
-
-EXTRA_DIST = xpm2
-
-noinst_HEADERS = about.h docking.h encoder.h filedump.h gchan_events.h gchan.h \
- gen.h gradiosched.h gtk2_gui.h gtkdial.h ice.h listpack.h musegtk.h utils.h \
- vumeters.h xmlprofile.h
-
-noinst_LIBRARIES = libnightolo2.a
-
-libnightolo2_a_SOURCES = \
- docking.cpp \
- gchan.cpp \
- gchan_events.cpp \
- ice.cpp \
- encoder.cpp \
- filedump.cpp \
- musegtk.cpp \
- listpack.cpp \
- gtkdial.cpp \
- utils.cpp \
- vumeters.cpp \
- about.cpp \
- gtk2_gui.cpp \
- xmlprofile.cpp \
- gradiosched.cpp