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
|
---
lib/libOSSlib/Makefile | 5 +++--
lib/libsalsa/Makefile | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
--- a/lib/libsalsa/Makefile
+++ b/lib/libsalsa/Makefile
@@ -2,7 +2,8 @@ LOBJECTS=main.lo output.lo misc.lo pcm.l
OSSLIBDIR=/usr/lib/oss
-CFLAGS=-O -I../../include -I../libOSSlib
+CFLAGS+=-I../../include -I../libOSSlib
+CFLAGS+=$(CPPFLAGS)
LIBTOOL=libtool --tag=CC
all: libsalsa.la
@@ -46,7 +47,7 @@ rawmidi.lo: rawmidi.c
$(LIBTOOL) --mode=compile ${CC} $(CFLAGS) -c rawmidi.c
libsalsa.la: $(LOBJECTS)
- $(LIBTOOL) --mode=link ${CC} -rpath /usr/lib -Wl,--version-script=Versions -version-info 2:0:0 -o libsalsa.la $(LOBJECTS) -L../libOSSlib -lOSSlib
+ $(LIBTOOL) --mode=link ${CC} $(LDFLAGS) -rpath /usr/lib -Wl,--version-script=Versions -version-info 2:0:0 -o libsalsa.la $(LOBJECTS) -L../libOSSlib -lOSSlib
install: libsalsa.la
$(LIBTOOL) cp libsalsa.la /usr/lib
--- a/lib/libOSSlib/Makefile
+++ b/lib/libOSSlib/Makefile
@@ -1,7 +1,8 @@
OBJS=libmain.o midiparser.o play_event.o
INSTALLLIB=/lib
-LDFLAGS=-shared -fPIC
-CFLAGS=-O -fPIC
+LDFLAGS+=-shared -fPIC
+CFLAGS+=-fPIC
+CFLAGS+=$(CPPFLAGS)
#LDFLAGS=-Bdynamic
AROPTS=rc
AR=ar
|
