blob: d6522736d046eccd18ff85dd1acc66a1010c447c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
#
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#
--- mp3blaster-3.1.3/src/Makefile.am~includedir
+++ mp3blaster-3.1.3/src/Makefile.am
@@ -36,7 +36,7 @@
mp3tag_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
mp3tag_LDADD = @LIBMPEGSOUND@ @LIBMYSQL@
mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
-INCLUDES = -I$(top_srcdir)/mpegsound -I/usr/include/ncurses -I$(top_srcdir)/nmixer -I$(includedir)
+INCLUDES = -I$(top_srcdir)/mpegsound -I$(top_srcdir)/nmixer
mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @NCURSES_LIBS@
EXTRA_DIST = FILES
CXXFLAGS = @CXXFLAGS@ @NAS_CFLAGS@ -DMP3BLASTER_DOCDIR=\"${pkgdatadir}\"
--- mp3blaster-3.1.3/mpegsound/Makefile.am~includedir
+++ mp3blaster-3.1.3/mpegsound/Makefile.am
@@ -11,5 +11,5 @@
noinst_HEADERS = mpegsound.h mpegsound_locals.h
-INCLUDES = -I$(srcdir) -I$(includedir)
+INCLUDES = -I$(srcdir)
CXXFLAGS = @CXXFLAGS@ @NAS_CFLAGS@
--- mp3blaster-3.1.3/nmixer/Makefile.am~includedir
+++ mp3blaster-3.1.3/nmixer/Makefile.am
@@ -2,7 +2,7 @@
nmixer_SOURCES = main.cc
nmixer_DEPENDENCIES = @LIBNMIXER@
LDADD = @LIBNMIXER@ @NCURSES_LIBS@
-INCLUDES = -I/usr/include/ncurses -I$(srcdir) -I$(includedir)
+INCLUDES = -I$(srcdir)
noinst_LIBRARIES = libnmixer.a
libnmixer_a_SOURCES = nmixer.cc mixers.cc ossmixer.cc nasmixer.cc nmixer.h \
getopt.c getopt1.c getopt.h
--- mp3blaster-3.1.3/src/Makefile.in~includedir
+++ mp3blaster-3.1.3/src/Makefile.in
@@ -86,7 +86,7 @@
mp3tag_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
mp3tag_LDADD = @LIBMPEGSOUND@ @LIBMYSQL@
mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
-INCLUDES = -I$(top_srcdir)/mpegsound -I/usr/include/ncurses -I$(top_srcdir)/nmixer -I$(includedir)
+INCLUDES = -I$(top_srcdir)/mpegsound -I$(top_srcdir)/nmixer
mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @NCURSES_LIBS@
EXTRA_DIST = FILES
CXXFLAGS = @CXXFLAGS@ @NAS_CFLAGS@ -DMP3BLASTER_DOCDIR=\"${pkgdatadir}\"
--- mp3blaster-3.1.3/nmixer/Makefile.in~includedir
+++ mp3blaster-3.1.3/nmixer/Makefile.in
@@ -79,7 +79,7 @@
nmixer_SOURCES = main.cc
nmixer_DEPENDENCIES = @LIBNMIXER@
LDADD = @LIBNMIXER@ @NCURSES_LIBS@
-INCLUDES = -I/usr/include/ncurses -I$(srcdir) -I$(includedir)
+INCLUDES = -I$(srcdir)
noinst_LIBRARIES = libnmixer.a
libnmixer_a_SOURCES = nmixer.cc mixers.cc ossmixer.cc nasmixer.cc nmixer.h getopt.c getopt1.c getopt.h
--- mp3blaster-3.1.3/mpegsound/Makefile.in~includedir
+++ mp3blaster-3.1.3/mpegsound/Makefile.in
@@ -82,7 +82,7 @@
noinst_HEADERS = mpegsound.h mpegsound_locals.h
-INCLUDES = -I$(srcdir) -I$(includedir)
+INCLUDES = -I$(srcdir)
CXXFLAGS = @CXXFLAGS@ @NAS_CFLAGS@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
|