diff src/audacious/Makefile @ 3572:625af2797f35 trunk

Clean up Makefiles.

--- a/src/audacious/Makefile	Wed Sep 19 18:41:39 2007 +0900
+++ b/src/audacious/Makefile	Wed Sep 19 17:32:47 2007 +0200
@@ -1,137 +1,163 @@
-include ../../extra.mk
-
-SUBDIRS = $(INTL_OBJECTIVE) glade images ui
+SUBDIRS = ${INTL_OBJECTIVE}
 
 PROG = audacious
-
-LDFLAGS += $(AUDLDFLAGS)
-
-INCLUDES = \
-	auddrct.h \
-	configdb.h \
-	custom_uri.h \
-	dbus.h \
-	discovery.h \
-	dbus-service.h \
-	eventqueue.h \
-	flow.h \
-	formatter.h \
-	rcfile.h \
-	i18n.h \
-	input.h \
-	hook.h \
-	main.h \
-	mime.h \
-	output.h \
-	playback.h \
-	playlist.h \
-	playlist_container.h \
-	plugin.h \
-	strings.h \
-	tuple.h \
-	tuple_formatter.h \
-	tuple_compiler.h \
-	ui_fileinfopopup.h \
-	ui_lastfm.h\
-	ui_plugin_menu.h \
-	ui_preferences.h \
-	util.h \
-	vfs.h \
-	vfs_buffer.h \
-	vfs_buffered_file.h \
-	xconvert.h
-
-SRCS = \
-	auddrct.c \
-	build_stamp.c \
-	configdb.c \
-	custom_uri.c \
-	discovery.c \
-	dnd.c \
-	dock.c \
-	effect.c \
-	eventqueue.c \
-	fft.c \
-	flow.c \
-	formatter.c \
-	general.c \
-	glade.c \
-	hints.c \
-	hook.c \
-	iir.c \
-	iir_cfs.c \
-	iir_fpu.c \
-	input.c \
-	logger.c \
-	main.c \
-	memorypool.c \
-	mime.c \
-	output.c \
-	pixbuf_effects.c \
-	playback.c \
-	playback_evlisteners.c \
-	playlist.c \
-	playlist_container.c \
-	playlist_evlisteners.c \
-	pluginenum.c \
-	rcfile.c \
-	signals.c \
-	strings.c \
-	tuple.c \
-	tuple_formatter.c \
-	tuple_compiler.c \
-	skin.c \
-	ui_about.c \
-	ui_albumart.c \
-	ui_credits.c \
-	ui_equalizer.c \
-	ui_fileinfo.c \
-	ui_fileinfopopup.c \
-	ui_fileopener.c \
-	ui_jumptotrack.c \
-	ui_lastfm.c\
-	ui_main.c \
-	ui_main_evlisteners.c \
-	ui_manager.c \
-	ui_playlist.c \
-	ui_playlist_manager.c \
-	ui_preferences.c \
-	ui_skinned_cursor.c \
-	ui_skinned_window.c \
-	ui_skinned_button.c \
-	ui_skinned_textbox.c \
-	ui_skinned_number.c \
-	ui_skinned_horizontal_slider.c \
-	ui_vis.c \
-	ui_svis.c \
-	ui_skinned_menurow.c \
-	ui_skinned_playstatus.c \
-	ui_skinned_monostereo.c \
-	ui_skinned_equalizer_slider.c \
-	ui_skinned_equalizer_graph.c \
-	ui_skinned_playlist_slider.c \
-	ui_skinned_playlist.c \
-	ui_skinselector.c \
-	ui_urlopener.c \
-	util.c \
-	vfs.c \
-	vfs_buffer.c \
-	vfs_buffered_file.c \
-	vfs_common.c \
-	visualization.c \
-	volumecontrol.c \
-	sync-menu.c \
-	xconvert.c
+SRCS = auddrct.c			\
+       build_stamp.c			\
+       configdb.c			\
+       custom_uri.c			\
+       discovery.c			\
+       dnd.c				\
+       dock.c				\
+       effect.c				\
+       eventqueue.c			\
+       fft.c				\
+       flow.c				\
+       formatter.c			\
+       general.c			\
+       glade.c				\
+       hints.c				\
+       hook.c				\
+       iir.c				\
+       iir_cfs.c			\
+       iir_fpu.c			\
+       input.c				\
+       logger.c				\
+       main.c				\
+       memorypool.c			\
+       mime.c				\
+       output.c				\
+       pixbuf_effects.c			\
+       playback.c			\
+       playback_evlisteners.c		\
+       playlist.c			\
+       playlist_container.c		\
+       playlist_evlisteners.c		\
+       pluginenum.c			\
+       rcfile.c				\
+       signals.c			\
+       strings.c			\
+       tuple.c				\
+       tuple_formatter.c		\
+       tuple_compiler.c			\
+       skin.c				\
+       ui_about.c			\
+       ui_albumart.c			\
+       ui_credits.c			\
+       ui_equalizer.c			\
+       ui_fileinfo.c			\
+       ui_fileinfopopup.c		\
+       ui_fileopener.c			\
+       ui_jumptotrack.c			\
+       ui_lastfm.c			\
+       ui_main.c			\
+       ui_main_evlisteners.c		\
+       ui_manager.c			\
+       ui_playlist.c			\
+       ui_playlist_manager.c		\
+       ui_preferences.c			\
+       ui_skinned_cursor.c		\
+       ui_skinned_window.c		\
+       ui_skinned_button.c		\
+       ui_skinned_textbox.c		\
+       ui_skinned_number.c		\
+       ui_skinned_horizontal_slider.c	\
+       ui_vis.c				\
+       ui_svis.c			\
+       ui_skinned_menurow.c		\
+       ui_skinned_playstatus.c		\
+       ui_skinned_monostereo.c		\
+       ui_skinned_equalizer_slider.c	\
+       ui_skinned_equalizer_graph.c	\
+       ui_skinned_playlist_slider.c	\
+       ui_skinned_playlist.c		\
+       ui_skinselector.c		\
+       ui_urlopener.c			\
+       util.c				\
+       vfs.c				\
+       vfs_buffer.c			\
+       vfs_buffered_file.c		\
+       vfs_common.c			\
+       visualization.c			\
+       volumecontrol.c			\
+       sync-menu.c			\
+       xconvert.c
 
 ifdef USE_DBUS
 SRCS += dbus.c
 endif
 
-LIBDEP = ../libguess/libguess.a
+INCLUDES = auddrct.h		\
+	   configdb.h		\
+	   custom_uri.h		\
+	   dbus.h		\
+	   discovery.h		\
+	   dbus-service.h	\
+	   eventqueue.h		\
+	   flow.h		\
+	   formatter.h		\
+	   rcfile.h		\
+	   i18n.h		\
+	   input.h		\
+	   hook.h		\
+	   main.h		\
+	   mime.h		\
+	   output.h		\
+	   playback.h		\
+	   playlist.h		\
+	   playlist_container.h	\
+	   plugin.h		\
+	   strings.h		\
+	   tuple.h		\
+	   tuple_formatter.h	\
+	   tuple_compiler.h	\
+	   ui_fileinfopopup.h	\
+	   ui_lastfm.h		\
+	   ui_plugin_menu.h	\
+	   ui_preferences.h	\
+	   util.h		\
+	   vfs.h		\
+	   vfs_buffer.h		\
+	   vfs_buffered_file.h	\
+	   xconvert.h
+
+DATA = glade/fileinfo.glade			\
+       glade/prefswin.glade			\
+       images/about-logo.png			\
+       images/appearance.png			\
+       images/audacious_eq.xpm			\
+       images/audacious_player.xpm		\
+       images/audacious_playlist.xpm		\
+       images/audio.png				\
+       images/connectivity.png			\
+       images/eq.png				\
+       images/info.png				\
+       images/menu_invert_playlist.png		\
+       images/menu_queue_toggle.png		\
+       images/menu_randomize_playlist.png	\
+       images/menu_remove_dups.png		\
+       images/menu_remove_unavail.png		\
+       images/menu_select_all.png		\
+       images/menu_select_invert.png		\
+       images/menu_select_none.png		\
+       images/menu_sort_artist.png		\
+       images/menu_sort_filename.png		\
+       images/menu_sort_pathfile.png		\
+       images/menu_sort_title.png		\
+       images/mouse.png				\
+       images/pl.png				\
+       images/play.png				\
+       images/playlist.png			\
+       images/plugins.png			\
+       ui/equalizer.ui				\
+       ui/mainwin.ui				\
+       ui/playlist.ui				\
+       ui/carbon-menubar.ui
 
 include ../../buildsys.mk
+include ../../extra.mk
 
-LIBADD += $(LDADD)
+LDFLAGS += ${AUDLDFLAGS} ${EXPORTDYN}
+LIBS += ${LDADD}
 
 ifdef USE_DBUS	
 CPPFLAGS += -I../libaudclient
@@ -139,34 +165,31 @@
 LIBS += -L../libaudclient -laudclient
 endif
 
-LDFLAGS += ${EXPORTDYN}
-
-depend-hook: $(DBUS_BINDINGS)
+depend-hook: ${DBUS_BINDINGS}
 
-CPPFLAGS += -DHAVE_CONFIG_H \
-	$(MOWGLI_CFLAGS) \
-	$(GTK_CFLAGS) \
-	$(LIBGLADE_CFLAGS) \
-	$(BEEP_DEFINES) \
-	$(ARCH_DEFINES) \
-	$(DBUS_CFLAGS) \
-	$(samplerate_CFLAGS) \
-	$(REGEX_CFLAGS) \
-	$(LIBMCS_CFLAGS) \
-	-D_AUDACIOUS_CORE \
-	-I.. -I../.. \
-	-I./intl
+CPPFLAGS += -DHAVE_CONFIG_H		\
+	    ${MOWGLI_CFLAGS}		\
+	    ${GTK_CFLAGS}		\
+	    ${LIBGLADE_CFLAGS}		\
+	    ${BEEP_DEFINES}		\
+	    ${ARCH_DEFINES}		\
+	    ${DBUS_CFLAGS}		\
+	    ${samplerate_CFLAGS}	\
+	    ${REGEX_CFLAGS}		\
+	    ${LIBMCS_CFLAGS}		\
+	    -D_AUDACIOUS_CORE		\
+	    -I.. -I../..		\
+	    -I./intl
 
-LIBS += \
-	$(LIBINTL) \
-	$(samplerate_LIBS) \
-	../libguess/libguess.a \
-	$(GTK_LIBS) \
-	$(DBUS_LIBS) \
-	$(MOWGLI_LIBS) \
-	$(LIBMCS_LIBS) \
-	$(LIBGLADE_LIBS) \
-	$(REGEX_LIBS)
+LIBS += ${LIBINTL}		\
+	${samplerate_LIBS}	\
+	../libguess/libguess.a	\
+	${GTK_LIBS}		\
+	${DBUS_LIBS}		\
+	${MOWGLI_LIBS}		\
+	${LIBMCS_LIBS}		\
+	${LIBGLADE_LIBS}	\
+	${REGEX_LIBS}
 
 build_stamp.c: 
 	if [ -d ../../.hg ]; then \
@@ -179,23 +202,21 @@
 		rm -f build_stamp.c; \
 	fi
 
-DBUS_BINDINGS_SOURCES = \
-	objects.xml \
-	mpris_root.xml \
-	mpris_tracklist.xml \
-	mpris_player.xml
+DBUS_BINDINGS_SOURCES = objects.xml		\
+			mpris_root.xml		\
+			mpris_tracklist.xml	\
+			mpris_player.xml
 
 desktop_DATA = audacious.desktop
-desktopdir = $(datadir)/applications
+desktopdir = ${datadir}/applicationu
 
-dbus-server-bindings.h: $(DBUS_BINDINGS_SOURCES)
-	$(DBUS_BINDING_TOOL) --mode=glib-server --prefix=audacious_rc objects.xml > $@
-	$(DBUS_BINDING_TOOL) --mode=glib-server --prefix=mpris_root mpris_root.xml >> $@
-	$(DBUS_BINDING_TOOL) --mode=glib-server --prefix=mpris_tracklist mpris_tracklist.xml >> $@
-	$(DBUS_BINDING_TOOL) --mode=glib-server --prefix=mpris_player mpris_player.xml >> $@
+dbus-server-bindings.h: ${DBUS_BINDINGS_SOURCES}
+	${DBUS_BINDING_TOOL} --mode=glib-server --prefix=audacious_rc objects.xml > $@
+	${DBUS_BINDING_TOOL} --mode=glib-server --prefix=mpris_root mpris_root.xml >> $@
+	${DBUS_BINDING_TOOL} --mode=glib-server --prefix=mpris_tracklist mpris_tracklist.xml >> $@
+	${DBUS_BINDING_TOOL} --mode=glib-server --prefix=mpris_player mpris_player.xml >> $@
 
-dbus-client-bindings.h: $(DBUS_BINDINGS_SOURCES)
-	$(DBUS_BINDING_TOOL) --mode=glib-client --prefix=audacious_rc objects.xml > $@
+dbus-client-bindings.h: ${DBUS_BINDINGS_SOURCES}
+	${DBUS_BINDING_TOOL} --mode=glib-client --prefix=audacious_rc objects.xml > $@
 
-OBJECTIVE_DATA = audacious.desktop:$(datadir)/applications
-
+OBJECTIVE_DATA = audacious.desktop:${datadir}/applications