libipod-build-cleanup.patch

   1 Index: examples/Makefile.am
   2 ===================================================================
   3 RCS file: /cvsroot/libipod/libipod/examples/Makefile.am,v
   4 retrieving revision 1.1.1.1
   5 diff -u -p -r1.1.1.1 Makefile.am
   6 --- examples/Makefile.am        14 Dec 2005 21:26:33 -0000      1.1.1.1
   7 +++ examples/Makefile.am        5 Mar 2007 21:58:24 -0000
   8 @@ -1,23 +1,15 @@
   9  noinst_PROGRAMS = dumptracks dumptracks_cpp readwritedb teststrings
  10
  11 -INCLUDES = -I../src -I../include
  12 +INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include
  13
  14  dumptracks_SOURCES = dumptracks.c
  15 -dumptracks_LDFLAGS = -L../src -L../src/.libs
  16 -dumptracks_LDADD = -lipod -lexpat
  17 -dumptracks_DEPENDENCIES = ../src/.libs/libipod.a
  18 +dumptracks_LDADD = $(top_builddir)/src/libipod.la
  19
  20  dumptracks_cpp_SOURCES = dumptracks_cpp.cpp
  21 -dumptracks_cpp_LDFLAGS = -L../src -L../src/.libs
  22 -dumptracks_cpp_LDADD = -lipod
  23 -dumptracks_cpp_DEPENDENCIES = ../src/.libs/libipod.a
  24 +dumptracks_cpp_LDADD = $(top_builddir)/src/libipod.la
  25
  26  readwritedb_SOURCES = readwritedb.c
  27 -readwritedb_LDFLAGS = -L../src -L../src/.libs
  28 -readwritedb_LDADD = -lipod
  29 -readwritedb_DEPENDENCIES = ../src/.libs/libipod.a
  30 +readwritedb_LDADD = $(top_builddir)/src/libipod.la
  31
  32  teststrings_SOURCES = teststrings.c
  33 -teststrings_LDFLAGS = -L../src -L../src/.libs
  34 -teststrings_LDADD = -lipod
  35 -teststrings_DEPENDENCIES = ../src/.libs/libipod.a
  36 +teststrings_LDADD = $(top_builddir)/src/libipod.la
  37 Index: src/Makefile.am
  38 ===================================================================
  39 RCS file: /cvsroot/libipod/libipod/src/Makefile.am,v
  40 retrieving revision 1.1.1.1
  41 diff -u -p -r1.1.1.1 Makefile.am
  42 --- src/Makefile.am     14 Dec 2005 21:26:33 -0000      1.1.1.1
  43 +++ src/Makefile.am     5 Mar 2007 21:58:24 -0000
  44 @@ -1,7 +1,7 @@
  45  #lib_LIBRARIES = libipod.a
  46  #libipod_a_SOURCES =
  47
  48 -INCLUDES = -I../include
  49 +INCLUDES = -I$(top_srcdir)/include
  50  lib_LTLIBRARIES = libipod.la
  51  libipod_la_SOURCES = \
  52         plist.c \