diff src/audacious/Makefile @ 4751:b87f8c707b7f

branch merge

--- a/src/audacious/Makefile	Wed Aug 06 22:30:35 2008 +0300
+++ b/src/audacious/Makefile	Wed Aug 06 22:33:27 2008 +0300
@@ -3,87 +3,90 @@
 SUBDIRS = ${INTL_OBJECTIVE}
 
 PROG = audacious${PROG_SUFFIX}
-SRCS = af_equalizer.c					\
-       auddrct.c						\
-       audconfig.c						\
-       build_stamp.c					\
-       configdb.c						\
-       custom_uri.c						\
-       discovery.c						\
-       dnd.c							\
-       effect.c							\
-       equalizer_flow.c					\
-       eventqueue.c						\
-       fft.c							\
-       flow.c							\
-       general.c						\
-       hook.c							\
-       icons-stock.c					\
-       interface.c						\
-       input.c							\
-       logger.c							\
-       main.c							\
-       mime.c							\
-       output.c							\
-       pixbuf_effects.c					\
-       playback.c						\
-       playback_evlisteners.c			\
-       playlist.c						\
-       playlist_container.c				\
-       pluginenum.c						\
-       rcfile.c							\
-       signals.c						\
-       src_flow.c						\
-       strings.c						\
-       tuple.c							\
-       tuple_formatter.c				\
-       tuple_compiler.c					\
+SRCS = af_equalizer.c							\
+       auddrct.c								\
+       audconfig.c								\
+       build_stamp.c							\
+       configdb.c								\
+       custom_uri.c								\
+       discovery.c								\
+       dnd.c									\
+       effect.c									\
+       equalizer.c								\
+       equalizer_flow.c							\
+       equalizer_preset.c						\
+       eventqueue.c								\
+       fft.c									\
+       flow.c									\
+       general.c								\
+       hook.c									\
+       icons-stock.c							\
+       interface.c								\
+       input.c									\
+       logger.c									\
+       main.c									\
+       mime.c									\
+       output.c									\
+       pixbuf_effects.c							\
+       playback.c								\
+       playback_evlisteners.c					\
+       playlist.c								\
+       playlist_container.c						\
+       pluginenum.c								\
+       rcfile.c									\
+       signals.c								\
+       src_flow.c								\
+       strings.c								\
+       tuple.c									\
+       tuple_formatter.c						\
+       tuple_compiler.c							\
+       ui_fileinfopopup.c						\
+       ui_fileopener.c							\
+       ui_headless.c							\
+       ui_legacy.c								\
+       ui_new.c									\
+       ui_preferences.c							\
+       util.c									\
+       vfs.c									\
+       vfs_buffer.c								\
+       vfs_buffered_file.c						\
+       vfs_common.c								\
+       visualization.c							\
+       volumecontrol.c							\
+       sync-menu.c								\
        ui_about.c						\
-       ui_albumart.c					\
+       ui_albumart.c						\
        ui_credits.c						\
-       ui_dock.c						\
-       ui_equalizer.c					\
-       ui_fileinfo.c					\
-       ui_fileinfopopup.c				\
-       ui_fileopener.c					\
-       ui_headless.c					\
-       ui_hints.c						\
+       legacy/ui_dock.c							\
+       legacy/ui_equalizer.c					\
+       ui_fileinfo.c						\
+       legacy/ui_hints.c						\
        ui_jumptotrack.c					\
        ui_jumptotrack_cache.c			\
-       ui_legacy.c				\
-       ui_main.c						\
-       ui_main_evlisteners.c			\
-       ui_manager.c						\
-       ui_new.c							\
-       ui_playlist.c					\
-       ui_playlist_evlisteners.c		\
-       ui_playlist_manager.c			\
-       ui_preferences.c					\
-       ui_skin.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				\
+       legacy/ui_main.c							\
+       legacy/ui_main_evlisteners.c				\
+       legacy/ui_manager.c						\
+       legacy/ui_playlist.c						\
+       legacy/ui_playlist_evlisteners.c			\
+       legacy/ui_playlist_manager.c				\
+       legacy/ui_skin.c							\
+       legacy/ui_skinned_window.c				\
+       legacy/ui_skinned_button.c				\
+       legacy/ui_skinned_textbox.c				\
+       legacy/ui_skinned_number.c				\
+       legacy/ui_skinned_horizontal_slider.c	\
+       legacy/ui_vis.c							\
+       legacy/ui_svis.c							\
+       legacy/ui_skinned_menurow.c				\
+       legacy/ui_skinned_playstatus.c			\
+       legacy/ui_skinned_monostereo.c			\
+       legacy/ui_skinned_equalizer_slider.c		\
+       legacy/ui_skinned_equalizer_graph.c		\
+       legacy/ui_skinned_playlist_slider.c		\
+       legacy/ui_skinned_playlist.c				\
+       legacy/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
+       ui_playlist_widget.c				\
 
 ifeq ($(USE_DBUS),yes)
 SRCS += dbus.c
@@ -96,13 +99,14 @@
            dbus.h				\
            discovery.h			\
            dbus-service.h		\
+           equalizer_preset.h			\
            eventqueue.h			\
            flow.h				\
            rcfile.h				\
            i18n.h				\
            input.h				\
            hook.h				\
-           interface.h				\
+           interface.h			\
            main.h				\
            mime.h				\
            output.h				\
@@ -180,7 +184,8 @@
 		-I../libSAD				\
 		${EGGSM_CFLAGS}			\
 		-I.. -I../..			\
-		-I./intl
+		-I./intl			\
+		-I.
 
 LIBS += ${LDADD}						\
 		${LIBINTL}						\