more random patches. who knows.

[patches.git] / libipod-build-cleanup.patch

Index: examples/Makefile.am
===================================================================
RCS file: /cvsroot/libipod/libipod/examples/Makefile.am,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile.am
--- examples/Makefile.am	14 Dec 2005 21:26:33 -0000	1.1.1.1
+++ examples/Makefile.am	5 Mar 2007 21:58:24 -0000
@@ -1,23 +1,15 @@
 noinst_PROGRAMS = dumptracks dumptracks_cpp readwritedb teststrings
 
-INCLUDES = -I../src -I../include
+INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include
 
 dumptracks_SOURCES = dumptracks.c
-dumptracks_LDFLAGS = -L../src -L../src/.libs
-dumptracks_LDADD = -lipod -lexpat
-dumptracks_DEPENDENCIES = ../src/.libs/libipod.a
+dumptracks_LDADD = $(top_builddir)/src/libipod.la
 
 dumptracks_cpp_SOURCES = dumptracks_cpp.cpp
-dumptracks_cpp_LDFLAGS = -L../src -L../src/.libs
-dumptracks_cpp_LDADD = -lipod
-dumptracks_cpp_DEPENDENCIES = ../src/.libs/libipod.a
+dumptracks_cpp_LDADD = $(top_builddir)/src/libipod.la
 
 readwritedb_SOURCES = readwritedb.c
-readwritedb_LDFLAGS = -L../src -L../src/.libs
-readwritedb_LDADD = -lipod
-readwritedb_DEPENDENCIES = ../src/.libs/libipod.a
+readwritedb_LDADD = $(top_builddir)/src/libipod.la
 
 teststrings_SOURCES = teststrings.c
-teststrings_LDFLAGS = -L../src -L../src/.libs
-teststrings_LDADD = -lipod
-teststrings_DEPENDENCIES = ../src/.libs/libipod.a
+teststrings_LDADD = $(top_builddir)/src/libipod.la
Index: src/Makefile.am
===================================================================
RCS file: /cvsroot/libipod/libipod/src/Makefile.am,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile.am
--- src/Makefile.am	14 Dec 2005 21:26:33 -0000	1.1.1.1
+++ src/Makefile.am	5 Mar 2007 21:58:24 -0000
@@ -1,7 +1,7 @@
 #lib_LIBRARIES = libipod.a
 #libipod_a_SOURCES = 
 
-INCLUDES = -I../include
+INCLUDES = -I$(top_srcdir)/include
 lib_LTLIBRARIES = libipod.la
 libipod_la_SOURCES = \
 	plist.c \