diff src/audacious/Makefile @ 3535:9ddf21ab5c84 trunk

Transit to Mk2.

--- a/src/audacious/Makefile	Sat Sep 15 11:07:24 2007 +0200
+++ b/src/audacious/Makefile	Mon Sep 17 13:10:19 2007 -0500
@@ -1,39 +1,12 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
-include ../../mk/objective.mk
+include ../../extra.mk
 
 SUBDIRS = $(INTL_OBJECTIVE) glade images ui
 
-OBJECTIVE_BINS = audacious
+PROG = audacious
 
 LDFLAGS += $(AUDLDFLAGS)
 
-LDADD = \
-	$(LIBINTL) \
-	$(samplerate_LIBS) \
-	$(CHARDET_LIBS) \
-	$(GTK_LIBS) \
-	$(DBUS_LIBS) \
-	$(MOWGLI_LIBS) \
-	$(LIBMCS_LIBS) \
-	$(LIBGLADE_LIBS) \
-	$(REGEX_LIBS)
-
-CFLAGS += \
-	$(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
-
-HEADERS = \
+INCLUDES = \
 	auddrct.h \
 	configdb.h \
 	custom_uri.h \
@@ -67,7 +40,7 @@
 	vfs_buffered_file.h \
 	xconvert.h
 
-SOURCES = \
+SRCS = \
 	auddrct.c \
 	build_stamp.c \
 	configdb.c \
@@ -147,29 +120,56 @@
 	sync-menu.c \
 	xconvert.c
 
+ifdef USE_DBUS
+SRCS += dbus.c
+endif
+
 LIBDEP = ../libguess/libguess.a
 
-ifdef USE_DBUS
-SOURCES += dbus.c
-CFLAGS += -I../libaudclient
-DBUS_BINDINGS = dbus-server-bindings.h dbus-client-bindings.h
-OBJECTIVE_LIBS_NOINST += $(DBUS_BINDINGS)
-LIBDEP += ../libaudclient/libaudclient$(SHARED_SUFFIX)
-LDADD += -L../libaudclient -laudclient
-endif
+include ../../buildsys.mk
 
 LIBADD += $(LDADD)
 
-depend-prehook: $(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
+
+LIBS += \
+	$(LIBINTL) \
+	$(samplerate_LIBS) \
+	../libguess/libguess.a \
+	$(GTK_LIBS) \
+	$(DBUS_LIBS) \
+	$(MOWGLI_LIBS) \
+	$(LIBMCS_LIBS) \
+	$(LIBGLADE_LIBS) \
+	$(REGEX_LIBS)
+
+ifdef USE_DBUS	
+CPPFLAGS += -I../libaudclient
+DBUS_BINDINGS = dbus-server-bindings.h dbus-client-bindings.h
+LIBS += -L../libaudclient -laudclient
+endif
 
 build_stamp.c: 
 	if [ -d ../../.hg ]; then \
 		revh=`hg tip --template 'const char *svn_stamp = "#rev#:#node|short#";\n' 2>/dev/null`; \
 		[ -z "$$revh" ] || echo "$$revh" > build_stamp.c; \
-		printf "%10s     %-20s\n" STAMP "build_stamp.c"; \
 	fi
 
-clean-prehook:
+clean-hook:
 	if [ -d ../../.hg ]; then \
 		rm -f build_stamp.c; \
 	fi
@@ -180,17 +180,9 @@
 	mpris_tracklist.xml \
 	mpris_player.xml
 
-OBJECTS = ${SOURCES:.c=.o}
-
 desktop_DATA = audacious.desktop
 desktopdir = $(datadir)/applications
 
-build-prehook: $(PCH)
-
-audacious: $(OBJECTS) $(LIBDEP)
-	$(CXX) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@
-	@printf "%10s     %-20s\n" LINK $@
-
 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 >> $@