summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFilippo Giunchedi <filippo@esaurito.net>2009-10-03 21:50:31 (GMT)
committer Filippo Giunchedi <filippo@esaurito.net>2009-10-03 21:59:14 (GMT)
commit57144e9c6c65700e7c18d0545bf145f800ec6d2e (patch)
treeaa295dd69ca00f90c2aa26433140c92afc03b4cc
parent2a33a7be9f179c12e1c4f7f23dcbebaf5f872be5 (diff)
fix "make dist" to have a proper tarball
now to have a distributable tarball is a matter of make dist
-rw-r--r--Makefile.am8
-rw-r--r--configure.ac4
-rw-r--r--lib/libmpeg/Makefile.am2
-rw-r--r--lib/portaudio/Makefile.am3
-rw-r--r--po/Makefile8
-rw-r--r--src/Makefile.am8
-rw-r--r--src/gtkgui2/Makefile.am6
-rw-r--r--src/ncursesgui/Makefile.am6
-rw-r--r--src/ncursesgui/libcdk/Makefile.am6
9 files changed, 41 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am
index dcc2eba..c22b34e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,12 @@
SUBDIRS = lib src
-docs_DATA = README COPYING AUTHORS NEWS KNOWN-BUGS ChangeLog TODO USAGE
+dist_docs_DATA = README COPYING AUTHORS NEWS KNOWN-BUGS ChangeLog TODO USAGE
docsdir = ${prefix}/doc/MuSE
-man_MANS = muse.1
+dist_man_MANS = muse.1
ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = autogen.sh
+# FIXME doc should be in SUBDIRS and properly autotoolized
+# FIXME po should be properly gettexited
+EXTRA_DIST = autogen.sh doc po utils
diff --git a/configure.ac b/configure.ac
index e3b6b8c..db178b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ dnl ==============================================================
dnl Setup for automake
dnl ==============================================================
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([dist-bzip2])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
# never run autotools and configure automatically
@@ -131,7 +131,7 @@ dnl =================
dnl removed until someone fixes the Makefile (TODO)
dnl the current mess with locales prevents from compiling
dnl and i couldn't figure out why // jrml 11apr05
-dnl AM_GNU_GETTEXT
+dnl AM_GNU_GETTEXT([external])
dnl ALL_LINGUAS="it es"
dnl ====================
diff --git a/lib/libmpeg/Makefile.am b/lib/libmpeg/Makefile.am
index 6ae440f..2b61a65 100644
--- a/lib/libmpeg/Makefile.am
+++ b/lib/libmpeg/Makefile.am
@@ -1,3 +1,5 @@
+EXTRA_DIST = fileplayer.cc
+
noinst_LIBRARIES = libmpeg.a
libmpeg_a_SOURCES = soundinputstream.cc fileinput.cc httpinput.cc \
soundplayer.cc \
diff --git a/lib/portaudio/Makefile.am b/lib/portaudio/Makefile.am
index 6e0671d..5a60e80 100644
--- a/lib/portaudio/Makefile.am
+++ b/lib/portaudio/Makefile.am
@@ -1,6 +1,9 @@
+EXTRA_DIST = LICENSE
AUTOMAKE_OPTIONS = foreign
+noinst_HEADERS = pa_host.h pa_trace.h pa_unix.h portaudio.h ringbuffer.h
+
noinst_LIBRARIES = libportaudio.a
libportaudio_a_SOURCES = \
diff --git a/po/Makefile b/po/Makefile
index bb7fb48..0ccc08a 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,9 +1,9 @@
prefix = /usr/local
INSTALL= /usr/bin/install -c
-GMSGFMT = /sw/bin/msgfmt
-MSGFMT = /sw/bin/msgfmt
-MSGMERGE = @MSGMERGE@
-XGETTEXT = /sw/bin/xgettext
+GMSGFMT = /usr/bin/msgfmt
+MSGFMT = /usr/bin/msgfmt
+MSGMERGE = /usr/bin/msgmerge
+XGETTEXT = /usr/bin/xgettext
INSTALLNLSDIR=$(DESTDIR)${prefix}/share/locale
diff --git a/src/Makefile.am b/src/Makefile.am
index 5a7c305..0583ac6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,11 +4,17 @@ 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@
+ @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
bin_PROGRAMS = muse
diff --git a/src/gtkgui2/Makefile.am b/src/gtkgui2/Makefile.am
index abbdb2c..2ed0954 100644
--- a/src/gtkgui2/Makefile.am
+++ b/src/gtkgui2/Makefile.am
@@ -3,6 +3,12 @@ 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 = \
diff --git a/src/ncursesgui/Makefile.am b/src/ncursesgui/Makefile.am
index d957365..bf3f5cd 100644
--- a/src/ncursesgui/Makefile.am
+++ b/src/ncursesgui/Makefile.am
@@ -1,7 +1,13 @@
INCLUDES = -I$(top_srcdir)/src -I/sw/include -Ilibcdk
+EXTRA_DIST = coltable.c muse_console.cpp testgui.sh
+
noinst_LIBRARIES = librubik.a
+noinst_HEADERS = about.h connectbox.h debug.h encdata.h encsetbox.h entry.h \
+fselect.h itemlist.h label.h menu.h muse_console.h muse_tui.h ncurses_gui.h \
+play_infobox.h screen.h scroll.h single_channel.h slider.h streamsetbox.h
+
librubik_a_SOURCES = \
entry.cpp \
fselect.cpp \
diff --git a/src/ncursesgui/libcdk/Makefile.am b/src/ncursesgui/libcdk/Makefile.am
index 327f0e9..4322d17 100644
--- a/src/ncursesgui/libcdk/Makefile.am
+++ b/src/ncursesgui/libcdk/Makefile.am
@@ -1,6 +1,12 @@
INCLUDES = -I$(top_srcdir)/ncurses/libcdk
+noinst_HEADERS = alphalist.h binding.h buttonbox.h calendar.h cdk_config.h \
+cdk.h cdk_objs.h cdkscreen.h cdk_util.h curdefs.h dialog.h draw.h entry.h \
+fscale.h fselect.h graph.h histogram.h itemlist.h label.h marquee.h matrix.h \
+mentry.h menu.h radio.h scale.h scroll.h selection.h slider.h swindow.h \
+template.h viewer.h
+
noinst_LIBRARIES = libcdk.a
libcdk_a_SOURCES = \