Mercurial > audlegacy

changeset 1218:aaf012a5529c trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - more Makefile conversion
author nenolod
date Wed, 14 Jun 2006 01:16:45 -0700
parents ce65f2a60bdd
children aa693b651fee
files ChangeLog audacious/Makefile audacious/Makefile.in configure.ac
diffstat 4 files changed, 115 insertions(+), 107 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Jun 14 01:12:01 2006 -0700
+++ b/ChangeLog	Wed Jun 14 01:16:45 2006 -0700
@@ -1,3 +1,12 @@
+2006-06-14 08:12:01 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [1348]
+  - tell users to use GNU make
+  
+
+  Changes:        Modified:
+  +8 -10          trunk/mk/objective.mk  
+
+
 2006-06-14 07:52:27 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1346]
   - chase $(RM) change
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audacious/Makefile	Wed Jun 14 01:16:45 2006 -0700
@@ -0,0 +1,106 @@
+include ../mk/rules.mk
+include ../mk/objective.mk
+
+SUBDIRS = glade images
+
+beepincludedir = $(includedir)/audacious
+
+OBJECTIVE_BINS = audacious
+
+LDFLAGS += -Wl,-export-dynamic
+LDADD = \
+	$(GTK_LIBS)      \
+	$(LIBGLADE_LIBS) \
+	-L.. $(LTLIBINTL)     \
+	-L../libaudacious -laudacious \
+        -L../libguess $(CHARDET_LIBS)
+
+CFLAGS += \
+	$(GTK_CFLAGS)      \
+	$(LIBGLADE_CFLAGS) \
+	$(BEEP_DEFINES)    \
+	$(ARCH_DEFINES)    \
+	-I..    \
+	-I../intl
+
+HEADERS = \
+	input.h \
+	output.h \
+	plugin.h \
+	prefswin.h
+
+SOURCES = \
+	build_stamp.c \
+	genevent.c \
+	skin.c \
+	util.c \
+	output.c \
+	fft.c \
+	input.c \
+	effect.c \
+	general.c \
+	visualization.c \
+	pluginenum.c \
+	playlist.c \
+	controlsocket.c \
+	dock.c \
+	widget.c \
+	sbutton.c \
+	pbutton.c \
+	tbutton.c \
+	textbox.c \
+	menurow.c \
+	hslider.c \
+	monostereo.c \
+	vis.c \
+	svis.c \
+	number.c \
+	playback.c \
+	playstatus.c \
+	playlist_list.c \
+	playlist_slider.c \
+	playlist_popup.c \
+	eq_graph.c \
+	eq_slider.c \
+	main.c \
+	logger.c \
+	mainwin.c \
+	skinwin.c \
+	prefswin.c \
+	ui_playlist.c \
+	equalizer.c \
+	glade.c \
+	hints.c \
+	about.c credits.c \
+	softvolume.c \
+	getopt.c getopt1.c \
+	urldecode.c \
+	mkdtemp.c \
+	iir.c \
+	iir_cfs.c \
+	iir_fpu.c
+
+OBJECTS = ${SOURCES:.c=.o}
+
+beepinclude_HEADERS = plugin.h output.h input.h
+
+desktop_DATA = audacious.desktop
+desktopdir = $(datadir)/applications
+
+build_stamp.c:
+	if [ -d .svn ] || [ ! -f build_stamp.c ]; then		\
+		( \
+			echo '/* SVN repository version.'; \
+			echo ' * This auto-generated file must not be included in SVN; but must'; \
+			echo ' * be included in release tarballs.'; \
+			echo ' */'; \
+			echo '#include <glib.h>'; \
+			echo -n 'const gchar *svn_stamp = "'; \
+			(cd ..; svnversion -n .); \
+			echo '";' \
+		) > build_stamp.c; \
+	fi;
+
+audacious: $(OBJECTS)
+	$(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ -Wl,-rpath,${libdir}
+	@printf "%10s     %-20s\n" LINK $@
--- a/audacious/Makefile.in	Wed Jun 14 01:12:01 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-include ../mk/rules.mk
-include ../mk/objective.mk
-
-SUBDIRS = glade images
-
-beepincludedir = $(includedir)/audacious
-
-OBJECTIVE_BINS = audacious
-
-LDFLAGS += -Wl,-export-dynamic
-LDADD = \
-	$(GTK_LIBS)      \
-	$(LIBGLADE_LIBS) \
-	-L.. $(LTLIBINTL)     \
-	-L../libaudacious -laudacious \
-        -L../libguess $(CHARDET_LIBS)
-
-CFLAGS += \
-	$(GTK_CFLAGS)      \
-	$(LIBGLADE_CFLAGS) \
-	$(BEEP_DEFINES)    \
-	$(ARCH_DEFINES)    \
-	-I..    \
-	-I../intl
-
-HEADERS = \
-	input.h \
-	output.h \
-	plugin.h \
-	prefswin.h
-
-SOURCES = \
-	build_stamp.c \
-	genevent.c \
-	skin.c \
-	util.c \
-	output.c \
-	fft.c \
-	input.c \
-	effect.c \
-	general.c \
-	visualization.c \
-	pluginenum.c \
-	playlist.c \
-	controlsocket.c \
-	dock.c \
-	widget.c \
-	sbutton.c \
-	pbutton.c \
-	tbutton.c \
-	textbox.c \
-	menurow.c \
-	hslider.c \
-	monostereo.c \
-	vis.c \
-	svis.c \
-	number.c \
-	playback.c \
-	playstatus.c \
-	playlist_list.c \
-	playlist_slider.c \
-	playlist_popup.c \
-	eq_graph.c \
-	eq_slider.c \
-	main.c \
-	logger.c \
-	mainwin.c \
-	skinwin.c \
-	prefswin.c \
-	ui_playlist.c \
-	equalizer.c \
-	glade.c \
-	hints.c \
-	about.c credits.c \
-	softvolume.c \
-	getopt.c getopt1.c \
-	urldecode.c \
-	mkdtemp.c \
-	iir.c \
-	iir_cfs.c \
-	iir_fpu.c
-
-OBJECTS = ${SOURCES:.c=.o}
-
-beepinclude_HEADERS = plugin.h output.h input.h
-
-desktop_DATA = audacious.desktop
-desktopdir = $(datadir)/applications
-
-build_stamp.c:
-	if [ -d .svn ] || [ ! -f build_stamp.c ]; then		\
-		( \
-			echo '/* SVN repository version.'; \
-			echo ' * This auto-generated file must not be included in SVN; but must'; \
-			echo ' * be included in release tarballs.'; \
-			echo ' */'; \
-			echo '#include <glib.h>'; \
-			echo -n 'const gchar *svn_stamp = "'; \
-			(cd ..; svnversion -n .); \
-			echo '";' \
-		) > build_stamp.c; \
-	fi;
-
-audacious: $(OBJECTS)
-	$(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ -Wl,-rpath,${libdir}
-	@printf "%10s     %-20s\n" LINK $@
--- a/configure.ac	Wed Jun 14 01:12:01 2006 -0700
+++ b/configure.ac	Wed Jun 14 01:16:45 2006 -0700
@@ -841,7 +841,6 @@
         audacious.spec
         audacious.pc
         audacious/audacious.desktop
-        audacious/Makefile
         audacious/glade/Makefile
 	audacious/images/Makefile
         libaudacious/Makefile