mpg123/mpg123.patch@5524672ebbe7
mpg123/mpg123.patch
Fri, 17 Apr 2009 23:40:08 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Fri, 17 Apr 2009 23:40:08 +0200
- changeset 159
- 5524672ebbe7
- permissions
- -rw-r--r--
Update and completely overhaul packaging and build configuration.
1 Index: src/Makefile.in
2 --- src/Makefile.in.orig 2007-12-05 02:36:29 +0100
3 +++ src/Makefile.in 2007-12-05 08:34:08 +0100
4 @@ -57,7 +57,7 @@
5 term.$(OBJEXT) wav.$(OBJEXT) xfermem.$(OBJEXT)
6 mpg123_OBJECTS = $(am_mpg123_OBJECTS)
7 am__DEPENDENCIES_1 =
8 -DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
9 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -I$(top_srcdir)/libltdl
10 depcomp = $(SHELL) $(top_srcdir)/build/depcomp
11 am__depfiles_maybe = depfiles
12 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
13 @@ -294,7 +294,7 @@
15 # AM_CPPFLAGS =
16 mpg123_LDADD = $(LIBLTDL) libmpg123/libmpg123.la @MODULE_OBJ@ @OUTPUT_OBJ@ @OUTPUT_LIBS@
17 -mpg123_LDFLAGS = @LT_LDFLAGS@ @OUTPUT_LDFLAGS@
18 +mpg123_LDFLAGS = @LT_LDFLAGS@ @OUTPUT_LDFLAGS@ -static
19 # Just mpg123_INCLUDES has no effect on build! Trying that before reverting to AM_CPPFLAGS.
20 INCLUDES = $(LTDLINCL) -I$(top_srcdir)/src/libmpg123
21 # libltdl is not mentioned here... it's not that trivial
22 Index: src/output/Makefile.in
23 --- src/output/Makefile.in.orig 2007-12-05 02:36:30 +0100
24 +++ src/output/Makefile.in 2007-12-05 08:33:30 +0100
25 @@ -212,7 +212,7 @@
26 output_win32_la_OBJECTS = $(am_output_win32_la_OBJECTS)
27 @HAVE_MODULES_TRUE@@HAVE_WIN32_TRUE@am_output_win32_la_rpath = -rpath \
28 @HAVE_MODULES_TRUE@@HAVE_WIN32_TRUE@ $(pkglibdir)
29 -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src
30 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src -I$(top_srcdir)/libltdl
31 depcomp = $(SHELL) $(top_srcdir)/build/depcomp
32 am__depfiles_maybe = depfiles
33 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
