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
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
|
Index: libtritonus-java-20070428/src/lib/fluidsynth/Makefile.in
===================================================================
--- libtritonus-java-20070428.orig/src/lib/fluidsynth/Makefile.in 2007-10-26 07:57:32.000000000 +0530
+++ libtritonus-java-20070428/src/lib/fluidsynth/Makefile.in 2007-10-26 07:57:48.000000000 +0530
@@ -9,8 +9,8 @@
JAVAEXTLIBPATH=$(JAVADIR)/$(REL_JAVAEXTLIBPATH)
OSNAME=@OSNAME@
ARCHNAME=@ARCHNAME@
-CC=libtool --mode=compile @CC@
-CPPFLAGS=-g -Wall -Werror -I"$(JAVADIR)/include" -I"$(JAVADIR)/include/$(OSNAME)" #-fPIC -D_REENTRANT #-pedantic
+CC=@CC@
+CPPFLAGS=-g -Wall -I"$(JAVADIR)/include" -I"$(JAVADIR)/include/$(OSNAME)" -fPIC -D_REENTRANT #-pedantic
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
@@ -65,9 +65,9 @@
all: $(LIBDEST)
$(LIBDEST): $(OBJ)
- libtool --mode=link gcc -g -O -o $(LIBBASENAME).la $(LTOBJ) \
+## libtool --mode=link gcc -g -O -o $(LIBBASENAME).la $(LTOBJ) \
-rpath /usr/lib $(LIBS)
-## $(CC) -nostartfiles -shared -Wl,-soname,$(LIBBASENAME).so.1 -o $(LIBDEST) $(OBJ) -L/usr/lib $(LIBS)
+ $(CC) -nostartfiles -shared -Wl,-soname,$(LIBBASENAME).so.1 -o $(LIBDEST) $(OBJ) -L/usr/lib $(LIBS)
##
## use this for testing with a custom version of libfluidsynth
##
@@ -79,7 +79,7 @@
$(OBJ): $(JNIHEADERS)
-$(JNIHEADERS): $(JNICLASSFILES)
+$(JNIHEADERS):
$(RM_F) $(JNIHEADERS)
$(JAVAH) -d . $(JNICLASSES)
@@ -119,4 +119,4 @@
.PHONY: clean
clean:
rm -rf $(LIBDEST) $(JNIHEADERS) *.o *~
- libtool --mode=clean $(RM_F) $(LTOBJ) $(LIBBASENAME).la
\ No newline at end of file
+ libtool --mode=clean $(RM_F) $(LTOBJ) $(LIBBASENAME).la
Index: libtritonus-java-20070428/src/lib/cooked_ioctl/Makefile.in
===================================================================
--- libtritonus-java-20070428.orig/src/lib/cooked_ioctl/Makefile.in 2007-10-26 07:57:32.000000000 +0530
+++ libtritonus-java-20070428/src/lib/cooked_ioctl/Makefile.in 2007-10-26 07:57:48.000000000 +0530
@@ -10,6 +10,7 @@
OSNAME=@OSNAME@
ARCHNAME=@ARCHNAME@
CC=@CC@
+CXX=@CC@ -x c
CPPFLAGS=-g -Wall -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC -D_REENTRANT #-pedantic
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -33,11 +34,10 @@
JNIOBJ=\
org_tritonus_lowlevel_cdda_cooked_ioctl_CookedIoctl.o
-OBJ=$(JNIOBJ) \
- handlers.o
+OBJ=$(JNIOBJ)
JNIHEADERS:=\
- org_tritonus_lowlevel_cdda_cooked_0005fioctl_CookedIoctl.h
+ org_tritonus_lowlevel_cdda_cooked_ioctl_CookedIoctl.h
JNICLASSFILES=\
CookedIoctl.class
@@ -60,7 +60,7 @@
$(OBJ): $(JNIHEADERS)
-$(JNIHEADERS): $(JNICLASSFILES)
+$(JNIHEADERS):
$(RM_F) $(JNIHEADERS)
$(JAVAH) -d . $(JNICLASSES)
Index: libtritonus-java-20070428/src/lib/cdparanoia/Makefile.in
===================================================================
--- libtritonus-java-20070428.orig/src/lib/cdparanoia/Makefile.in 2007-10-26 07:57:32.000000000 +0530
+++ libtritonus-java-20070428/src/lib/cdparanoia/Makefile.in 2007-10-26 07:58:15.000000000 +0530
@@ -10,7 +10,7 @@
OSNAME=@OSNAME@
ARCHNAME=@ARCHNAME@
CC=@CC@
-CPPFLAGS=-g -Wall -Werror -I../common -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC -D_REENTRANT #-pedantic
+CPPFLAGS=-g -Wall -I../common -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC -D_REENTRANT #-pedantic
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
@@ -54,7 +54,7 @@
all: $(LIBDEST)
$(LIBDEST): $(OBJ)
- $(CC) -shared -Wl,-soname,$(LIBBASENAME).so.1 -Wl,-rpath,/home/matthias/java/tritonus/src/lib/common -o $(LIBDEST) $(OBJ) $(LIBS)
+ $(CC) -shared -Wl,-soname,$(LIBBASENAME).so.1 -o $(LIBDEST) $(OBJ) $(LIBS)
$(RM_F) $(LIBBASENAME).so.1
$(LN_S) $(LIBBASENAME).so.1.0 $(LIBBASENAME).so.1
$(RM_F) $(LIBBASENAME).so
@@ -62,7 +62,7 @@
$(OBJ): $(JNIHEADERS)
-$(JNIHEADERS): $(JNICLASSFILES)
+$(JNIHEADERS):
$(RM_F) $(JNIHEADERS)
$(JAVAH) -d . $(JNICLASSES)
Index: libtritonus-java-20070428/src/lib/alsa/Makefile.in
===================================================================
--- libtritonus-java-20070428.orig/src/lib/alsa/Makefile.in 2007-10-26 07:57:32.000000000 +0530
+++ libtritonus-java-20070428/src/lib/alsa/Makefile.in 2007-10-26 07:57:48.000000000 +0530
@@ -10,7 +10,7 @@
OSNAME=@OSNAME@
ARCHNAME=@ARCHNAME@
CC=@CC@
-CPPFLAGS=-g -Wall -Werror -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC -D_REENTRANT #-pedantic
+CPPFLAGS=-g -Wall -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC -D_REENTRANT #-pedantic
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
@@ -128,7 +128,7 @@
$(OBJ): $(JNIHEADERS)
-$(JNIHEADERS): $(JNICLASSFILES)
+$(JNIHEADERS):
$(RM_F) $(JNIHEADERS)
$(JAVAH) -d . $(JNICLASSES)
Index: libtritonus-java-20070428/src/lib/esd/Makefile.in
===================================================================
--- libtritonus-java-20070428.orig/src/lib/esd/Makefile.in 2007-10-26 07:57:32.000000000 +0530
+++ libtritonus-java-20070428/src/lib/esd/Makefile.in 2007-10-26 07:57:48.000000000 +0530
@@ -10,7 +10,7 @@
OSNAME=@OSNAME@
ARCHNAME=@ARCHNAME@
CC=@CC@
-CPPFLAGS=-g -Wall -Werror -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC -D_REENTRANT #-pedantic
+CPPFLAGS=-g -Wall -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC -D_REENTRANT #-pedantic
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
@@ -63,7 +63,7 @@
$(OBJ): $(JNIHEADERS)
-$(JNIHEADERS): $(JNICLASSFILES)
+$(JNIHEADERS):
$(RM_F) $(JNIHEADERS)
$(JAVAH) -d . $(JNICLASSES)
Index: libtritonus-java-20070428/src/lib/lame/Makefile.in
===================================================================
--- libtritonus-java-20070428.orig/src/lib/lame/Makefile.in 2007-10-26 07:57:32.000000000 +0530
+++ libtritonus-java-20070428/src/lib/lame/Makefile.in 2007-10-26 07:57:48.000000000 +0530
@@ -66,7 +66,7 @@
$(JNIOBJ): $(JNIHEADERS)
-$(JNIHEADERS): $(JNICLASSFILES)
+$(JNIHEADERS):
@$(RM_F) $(JNIHEADERS)
$(JAVAH) -d . $(JNICLASSES)
Index: libtritonus-java-20070428/src/lib/pvorbis/Makefile.in
===================================================================
--- libtritonus-java-20070428.orig/src/lib/pvorbis/Makefile.in 2007-10-26 07:57:32.000000000 +0530
+++ libtritonus-java-20070428/src/lib/pvorbis/Makefile.in 2007-10-26 07:57:48.000000000 +0530
@@ -99,7 +99,7 @@
$(OBJ): $(JNIHEADERS)
-$(JNIHEADERS): $(JNICLASSFILES)
+$(JNIHEADERS):
$(RM_F) $(JNIHEADERS)
$(JAVAH) -d . $(JNICLASSES)
Index: libtritonus-java-20070428/src/lib/vorbis/Makefile.in
===================================================================
--- libtritonus-java-20070428.orig/src/lib/vorbis/Makefile.in 2007-10-26 07:57:32.000000000 +0530
+++ libtritonus-java-20070428/src/lib/vorbis/Makefile.in 2007-10-26 08:02:03.000000000 +0530
@@ -10,7 +10,7 @@
OSNAME=@OSNAME@
ARCHNAME=@ARCHNAME@
CC=@CC@
-CPPFLAGS=-g -Wall -Werror -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC -D_REENTRANT #-pedantic
+CPPFLAGS=-g -Wall -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC -D_REENTRANT #-pedantic
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
@@ -85,7 +85,7 @@
$(OBJ): $(JNIHEADERS)
-$(JNIHEADERS): $(JNICLASSFILES)
+$(JNIHEADERS):
$(RM_F) $(JNIHEADERS)
$(JAVAH) -d . $(JNICLASSES)
Index: libtritonus-java-20070428/src/lib/common/Makefile.in
===================================================================
--- libtritonus-java-20070428.orig/src/lib/common/Makefile.in 2007-10-26 08:01:33.000000000 +0530
+++ libtritonus-java-20070428/src/lib/common/Makefile.in 2007-10-26 08:01:42.000000000 +0530
@@ -10,7 +10,7 @@
OSNAME=@OSNAME@
ARCHNAME=@ARCHNAME@
CC=@CC@
-CPPFLAGS=-g -Wall -Werror -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC -D_REENTRANT #-pedantic
+CPPFLAGS=-g -Wall -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC -D_REENTRANT #-pedantic
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
|
