Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 90614 | Differences between
and this patch

Collapse All | Expand All

(-)portmidi.orig/pm_linux/Makefile (-27 / +33 lines)
Lines 30-40 Link Here
30
# ALSALIB = 
30
# ALSALIB = 
31
# VFLAGS = -DPMNULL
31
# VFLAGS = -DPMNULL
32
32
33
pmlib = pm_linux/libportmidi.a
33
pmlib = pm_linux/libportmidi.so
34
34
35
ptlib = porttime/libporttime.a
35
ptlib = porttime/libporttime.so
36
36
37
CC = gcc $(VFLAGS) $(PMFLAGS) -g -Ipm_common -Iporttime
37
CFLAGS += -fPIC $(VFLAGS) $(PMFLAGS) -Ipm_common -Iporttime
38
38
39
pmobjects = pm_common/pmutil.o $(versions) pm_linux/pmlinux.o  \
39
pmobjects = pm_common/pmutil.o $(versions) pm_linux/pmlinux.o  \
40
	pm_common/portmidi.o pm_linux/finddefault.o
40
	pm_common/portmidi.o pm_linux/finddefault.o
Lines 44-101 Link Here
44
current: all
44
current: all
45
45
46
all: $(pmlib) $(ptlib) pm_test/test pm_test/sysex pm_test/midithread \
46
all: $(pmlib) $(ptlib) pm_test/test pm_test/sysex pm_test/midithread \
47
	pm_test/latency pm_test/midithru pm_test/qtest pm_test/mm \
47
	pm_test/latency pm_test/midithru pm_test/qtest pm_test/mm
48
	pm_java/pmjni/libpmjni.so pm_java/pmdefaults/pmdefaults.jar 
48
#	pm_java/pmjni/libpmjni.so pm_java/pmdefaults/pmdefaults.jar 
49
49
50
$(pmlib): pm_linux/Makefile $(pmobjects)
50
$(pmlib): pm_linux/Makefile $(pmobjects) $(ptlib)
51
	ar -cr $(pmlib) $(pmobjects)
51
	$(CC) $(LDFLAGS) $(CFLAGS) -shared -o $(pmlib) $(pmobjects) $(ALSALIB) -Lporttime -lporttime
52
52
53
$(ptlib): pm_linux/Makefile $(ptobjects)
53
$(ptlib): pm_linux/Makefile $(ptobjects)
54
	ar -cr $(ptlib) $(ptobjects)
54
	$(CC) $(LDFLAGS) $(CFLAGS) -shared -o $(ptlib) $(ptobjects) -lpthread
55
55
56
pm_linux/pmlinuxalsa.o: pm_linux/Makefile pm_linux/pmlinuxalsa.c pm_linux/pmlinuxalsa.h
56
pm_linux/pmlinuxalsa.o: pm_linux/Makefile pm_linux/pmlinuxalsa.c pm_linux/pmlinuxalsa.h
57
	$(CC) -c pm_linux/pmlinuxalsa.c -o pm_linux/pmlinuxalsa.o
57
	$(CC) $(CFLAGS) -c pm_linux/pmlinuxalsa.c -o pm_linux/pmlinuxalsa.o
58
58
59
#---------- test programs ------------
59
#---------- test programs ------------
60
60
61
61
62
62
63
pm_test/test: pm_linux/Makefile pm_test/test.o $(pmlib) $(ptlib)
63
pm_test/test: pm_linux/Makefile pm_test/test.o $(pmlib) $(ptlib)
64
	$(CC) pm_test/test.o -o pm_test/test $(pmlib) $(ptlib) $(ALSALIB)
64
	$(CC) $(LDFLAGS) $(CFLAGS) pm_test/test.o -o pm_test/test $(pmlib) $(ptlib) $(ALSALIB)
65
65
66
pm_test/sysex: pm_linux/Makefile pm_test/sysex.o $(pmlib) $(ptlib)
66
pm_test/sysex: pm_linux/Makefile pm_test/sysex.o $(pmlib) $(ptlib)
67
	$(CC) pm_test/sysex.o -o pm_test/sysex $(pmlib) $(ptlib) $(ALSALIB)
67
	$(CC) $(LDFLAGS) $(CFLAGS) pm_test/sysex.o -o pm_test/sysex $(pmlib) $(ptlib) $(ALSALIB)
68
68
69
pm_test/midithread: pm_linux/Makefile pm_test/midithread.o $(pmlib) $(ptlib)
69
pm_test/midithread: pm_linux/Makefile pm_test/midithread.o $(pmlib) $(ptlib)
70
	$(CC) pm_test/midithread.o -o pm_test/midithread \
70
	$(CC) $(LDFLAGS) $(CFLAGS) pm_test/midithread.o -o pm_test/midithread \
71
        $(pmlib) $(ptlib) $(ALSALIB)
71
        $(pmlib) $(ptlib) $(ALSALIB)
72
72
73
pm_test/latency: pm_linux/Makefile $(ptlib) pm_test/latency.o 
73
pm_test/latency: pm_linux/Makefile $(pmlib) $(ptlib) pm_test/latency.o 
74
	$(CC) pm_test/latency.o -o pm_test/latency $(pmlib) $(ptlib) \
74
	$(CC) $(LDFLAGS) $(CFLAGS) pm_test/latency.o -o pm_test/latency $(pmlib) $(ptlib) \
75
        $(ALSALIB) -lpthread -lm
75
        $(ALSALIB) -lpthread -lm
76
76
77
pm_test/midithru: pm_linux/Makefile $(ptlib) pm_test/midithru.o 
77
pm_test/midithru: pm_linux/Makefile $(pmlib) $(ptlib) pm_test/midithru.o 
78
	$(CC) pm_test/midithru.o -o pm_test/midithru $(pmlib) $(ptlib) \
78
	$(CC) $(LDFLAGS) $(CFLAGS) pm_test/midithru.o -o pm_test/midithru $(pmlib) $(ptlib) \
79
        $(ALSALIB) -lpthread -lm
79
        $(ALSALIB) -lpthread -lm
80
80
81
pm_test/mm: pm_linux/Makefile $(ptlib) pm_test/mm.o 
81
pm_test/mm: pm_linux/Makefile $(pmlib) $(ptlib) pm_test/mm.o 
82
	$(CC) pm_test/mm.o -o pm_test/mm $(pmlib) $(ptlib) \
82
	$(CC) $(LDFLAGS) $(CFLAGS) pm_test/mm.o -o pm_test/mm $(pmlib) $(ptlib) \
83
        $(ALSALIB) -lpthread -lm
83
        $(ALSALIB) -lpthread -lm
84
84
85
porttime/ptlinux.o: pm_linux/Makefile porttime/ptlinux.c
85
porttime/ptlinux.o: pm_linux/Makefile porttime/ptlinux.c
86
	$(CC) -c porttime/ptlinux.c -o porttime/ptlinux.o
86
	$(CC) $(CFLAGS) -c porttime/ptlinux.c -o porttime/ptlinux.o
87
87
88
pm_test/qtest: pm_linux/Makefile pm_test/qtest.o $(pmlib) $(ptlib)
88
pm_test/qtest: pm_linux/Makefile pm_test/qtest.o $(pmlib) $(ptlib)
89
	$(CC) pm_test/qtest.o -o pm_test/qtest $(pmlib) $(ptlib) $(ALSALIB)
89
	$(CC) $(LDFLAGS) $(CFLAGS) pm_test/qtest.o -o pm_test/qtest $(pmlib) $(ptlib) $(ALSALIB)
90
90
91
#------------ Java stuff here --------------
91
#------------ Java stuff here --------------
92
92
93
pm_java/pmjni/libpmjni.so: pm_java/pmjni/pmjni.c \
93
pm_java/pmjni/libpmjni.so: pm_java/pmjni/pmjni.c \
94
                       pm_java/pmjni/jportmidi_JportMidiApi.h
94
                       pm_java/pmjni/jportmidi_JportMidiApi.h
95
	gcc -o $@ -shared -Wl,-soname,libpmjni.so \
95
	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ -shared -Wl,-soname,libpmjni.so \
96
	    -lgcj -fPIC \
96
	    -lgcj -fPIC \
97
            -Ipm_common -Iporttime -Ipm_java/pmjni \
97
            -Ipm_common -Iporttime -Ipm_java/pmjni \
98
	    pm_java/pmjni/pmjni.c -static -lc $(pmlib) $(ptlib) $(ALSALIB)
98
	    pm_java/pmjni/pmjni.c -static -lc -lportmidi -Lporttime -lporttime $(ALSALIB)
99
99
100
#pm_java/pmjni/pmjni.so: pm_java/pmjni/pmjni.o \
100
#pm_java/pmjni/pmjni.so: pm_java/pmjni/pmjni.o \
101
#                        pm_java/pmjni/jportmidi_JportMidiApi.h
101
#                        pm_java/pmjni/jportmidi_JportMidiApi.h
Lines 146-156 Link Here
146
	# just in case, make it executable
146
	# just in case, make it executable
147
	cd pm_java; chmod +x pmdefaults/pmdefaults
147
	cd pm_java; chmod +x pmdefaults/pmdefaults
148
148
149
install:
149
#install:
150
	cp pm_java/pmjni/libpmjni.so /usr/local/lib
150
#	cp pm_java/pmjni/libpmjni.so /usr/local/lib
151
	cp pm_java/pmdefaults.jar /usr/share/java
151
#	cp pm_java/pmdefaults.jar /usr/share/java
152
	# do not chmod +x here since we are probably root
152
#	# do not chmod +x here since we are probably root
153
	cp pm_java/pmdefaults/pmdefaults /usr/local/bin
153
#	cp pm_java/pmdefaults/pmdefaults /usr/local/bin
154
155
install: all
156
	install -D -m755 $(pmlib) $(DESTDIR)/usr/$(LIBDIR)/libportmidi.so
157
	install -D -m644 pm_common/portmidi.h $(DESTDIR)/usr/include/portmidi.h
158
	install -D -m755 $(ptlib) $(DESTDIR)/usr/$(LIBDIR)/libporttime.so
159
	install -D -m644 porttime/porttime.h $(DESTDIR)/usr/include/porttime.h
154
160
155
clean:
161
clean:
156
	rm -f *.o *~ core* */*.o */*.so */*~ */core* pm_test/*/pm_dll.dll 
162
	rm -f *.o *~ core* */*.o */*.so */*~ */core* pm_test/*/pm_dll.dll 

Return to bug 90614