# HG changeset patch
# User chainsaw
# Date 1179788925 25200
# Node ID 9fb341e1a87f6eecac9500e3390152474456d9e5
# Parent  a42f95563c980d6c61197c244a4df696a4d8ea7d
[svn] This Makefile upsets it less. Needs LIBCDIO detection in configure.ac though.

diff -r a42f95563c98 -r 9fb341e1a87f ChangeLog
--- a/ChangeLog	Mon May 21 15:28:07 2007 -0700
+++ b/ChangeLog	Mon May 21 16:08:45 2007 -0700
@@ -1,3 +1,11 @@
+2007-05-21 22:28:07 +0000  
+  revision [2262]
+  Added cdaudio-ng
+  trunk/src/cdaudio-ng/Makefile     |   13 +
+  trunk/src/cdaudio-ng/cdaudio-ng.c |  410 ++++++++++++++++++++++++++++++++++++++
+  2 files changed, 423 insertions(+)
+
+
 2007-05-21 15:34:05 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [2260]
   - suppress warnings.
diff -r a42f95563c98 -r 9fb341e1a87f src/cdaudio-ng/Makefile
--- a/src/cdaudio-ng/Makefile	Mon May 21 15:28:07 2007 -0700
+++ b/src/cdaudio-ng/Makefile	Mon May 21 16:08:45 2007 -0700
@@ -1,13 +1,15 @@
+include ../../mk/rules.mk
+include ../../mk/init.mk
 
-all : libcdaudio-ng.so
+OBJECTIVE_LIBS = libcdaudio-ng$(SHARED_SUFFIX)
+
+LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(CDIO_LIBS)
+LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
-libcdaudio-ng.so :
-	gcc -shared -fPIC -o libcdaudio-ng.so cdaudio-ng.c \
-		$(shell pkg-config --libs --cflags libcdio) \
-		$(shell pkg-config --libs --cflags libcdio_paranoia) \
-		$(shell pkg-config --libs --cflags libcdio_cdda) \
-		$(shell pkg-config --libs --cflags glib-2.0) \
-		$(shell pkg-config --libs --cflags gtk+-2.0)
+SOURCES = cdaudio-ng.so 
+
+OBJECTS = ${SOURCES:.c=.o}
 
-clean :
-	rm *.so
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(CDIO_LIBS) -I../../intl -I../.. -I../..
+
+include ../../mk/objective.mk
diff -r a42f95563c98 -r 9fb341e1a87f src/cdaudio-ng/Makefile.WRONG
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cdaudio-ng/Makefile.WRONG	Mon May 21 16:08:45 2007 -0700
@@ -0,0 +1,13 @@
+
+all : libcdaudio-ng.so
+
+libcdaudio-ng.so :
+	gcc -shared -fPIC -o libcdaudio-ng.so cdaudio-ng.c \
+		$(shell pkg-config --libs --cflags libcdio) \
+		$(shell pkg-config --libs --cflags libcdio_paranoia) \
+		$(shell pkg-config --libs --cflags libcdio_cdda) \
+		$(shell pkg-config --libs --cflags glib-2.0) \
+		$(shell pkg-config --libs --cflags gtk+-2.0)
+
+clean :
+	rm *.so