Mercurial > hg > xmms-sid
changeset 180:d75e8051c84e
Not using recursive make anymore.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Wed, 18 Aug 2004 04:13:03 +0000 |
parents | eee1b3230d70 |
children | be1cf864f28e |
files | Makefile.am configure.in src/Makefile.am |
diffstat | 3 files changed, 41 insertions(+), 45 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Wed Aug 18 03:44:05 2004 +0000 +++ b/Makefile.am Wed Aug 18 04:13:03 2004 +0000 @@ -1,24 +1,50 @@ # Require latest automake AUTOMAKE_OPTIONS = 1.7 -# Directories to be BUILT and INSTALLED -SUBDIRS = src - # Additional directories to be included in DISTRIBUTION -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = src # All the rest of the distributed files -EXTRA_DIST = \ - FAQ \ - BUGS \ - THANKS \ - ChangeLog.old \ - autogen.sh \ - bootstrap.sh \ - xmms-sid.glade \ - xmms-sid.spec.in \ - xmms-sid.spec \ - xmms-1.2.10-songpos.patch +EXTRA_DIST = \ + FAQ \ + BUGS \ + THANKS \ + ChangeLog.old \ + autogen.sh \ + bootstrap.sh \ + xmms-sid.glade \ + xmms-sid.spec.in \ + xmms-sid.spec \ + xmms-1.2.10-songpos.patch \ + src/xmms-sid-logo.xpm ChangeLog: CVS/Entries src/CVS/Entries cvs2cl.pl --passwd /etc/passwd --domain tnsp.org + +# Generated libraries +lib_LTLIBRARIES = libxmmssid.la + +# Generals +AM_CFLAGS = -W -Wall -D_REENTRANT @XMMS_CFLAGS@ @SIDPLAY1_INCLUDES@ @SIDPLAY2_INCLUDES@ @BUILDERS_INCLUDES@ @NANOSID_INCLUDES@ +AM_CXXFLAGS = $(AM_CFLAGS) + +libxmmssid_la_LDFLAGS = -module -avoid-version @BUILDERS_LDFLAGS@ +libxmmssid_la_LIBADD = @XMMS_LIBS@ @SIDPLAY1_LDADD@ @SIDPLAY2_LDADD@ @RESID_LDADD@ @HARDSID_LDADD@ @NANOSID_LDADD@ + +# Plugin sources +libxmmssid_la_SOURCES = \ + src/xs_init.c \ + src/xs_about.c \ + src/xs_support.c src/xs_support.h \ + src/xs_config.c src/xs_config.h \ + src/xs_md5.c src/xs_md5.h \ + src/xs_length.c src/xs_length.h \ + src/xs_genui.c src/xs_genui.h \ + src/xs_glade.c src/xs_glade.h \ + src/xs_interface.c src/xs_interface.h \ + src/xs_stil.c src/xs_stil.h \ + src/xs_sidplay.h \ + src/xs_sidplay1.cc src/xs_sidplay1.h \ + src/xs_sidplay2.cc src/xs_sidplay2.h \ + src/xs_nanosid.c src/xs_nanosid.h \ + src/xmms-sid.c src/xmms-sid.h
--- a/configure.in Wed Aug 18 03:44:05 2004 +0000 +++ b/configure.in Wed Aug 18 04:13:03 2004 +0000 @@ -292,7 +292,6 @@ dnl *** AC_CONFIG_FILES([ Makefile -src/Makefile xmms-sid.spec ]) AC_OUTPUT
--- a/src/Makefile.am Wed Aug 18 03:44:05 2004 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -# Generated libraries -lib_LTLIBRARIES = libxmmssid.la - -# Generals -AM_CFLAGS = -W -Wall -D_REENTRANT @XMMS_CFLAGS@ @SIDPLAY1_INCLUDES@ @SIDPLAY2_INCLUDES@ @BUILDERS_INCLUDES@ @NANOSID_INCLUDES@ -AM_CXXFLAGS = $(AM_CFLAGS) - -libxmmssid_la_LDFLAGS = -module -avoid-version @BUILDERS_LDFLAGS@ -libxmmssid_la_LIBADD = @XMMS_LIBS@ @SIDPLAY1_LDADD@ @SIDPLAY2_LDADD@ @RESID_LDADD@ @HARDSID_LDADD@ @NANOSID_LDADD@ - -# Plugin sources -libxmmssid_la_SOURCES = \ - xs_init.c \ - xs_about.c \ - xs_support.c xs_support.h \ - xs_config.c xs_config.h \ - xs_md5.c xs_md5.h \ - xs_length.c xs_length.h \ - xs_genui.c xs_genui.h \ - xs_glade.c xs_glade.h \ - xs_interface.c xs_interface.h \ - xs_stil.c xs_stil.h \ - xs_sidplay.h \ - xs_sidplay1.cc xs_sidplay1.h \ - xs_sidplay2.cc xs_sidplay2.h \ - xs_nanosid.c xs_nanosid.h \ - xmms-sid.c xmms-sid.h - -EXTRA_DIST = xmms-sid-logo.xpm