Lines 1-7
Link Here
|
1 |
diff -Nur libmatthew-java-0.7.2/Makefile libmatthew-java-0.7.2_patched/Makefile |
1 |
diff -Nur libmatthew-java-0.7.2/Makefile libmatthew-java-0.7.2_patched/Makefile |
2 |
--- libmatthew-java-0.7.2/Makefile 2009-04-05 12:46:42.000000000 +0300 |
2 |
--- libmatthew-java-0.7.2/Makefile 2009-04-05 12:46:42.000000000 +0300 |
3 |
+++ libmatthew-java-0.7.2_patched/Makefile 2010-02-28 12:07:15.000000000 +0200 |
3 |
+++ libmatthew-java-0.7.2_patched/Makefile 2010-02-28 12:07:15.000000000 +0200 |
4 |
@@ -6,13 +6,13 @@ |
4 |
@@ -6,13 +6,12 @@ |
5 |
CC?=gcc |
5 |
CC?=gcc |
6 |
LD?=gcc |
6 |
LD?=gcc |
7 |
JPPFLAGS+=-C -P |
7 |
JPPFLAGS+=-C -P |
Lines 13-19
Link Here
|
13 |
JVERCFLAGS+=-source 1.5 |
13 |
JVERCFLAGS+=-source 1.5 |
14 |
JCFLAGS+= |
14 |
JCFLAGS+= |
15 |
-INCLUDES+=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux |
15 |
-INCLUDES+=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux |
16 |
+INCLUDES=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux |
|
|
17 |
JAVADOCFLAGS?=-quiet -author -link http://java.sun.com/j2se/1.4.2/docs/api/ |
16 |
JAVADOCFLAGS?=-quiet -author -link http://java.sun.com/j2se/1.4.2/docs/api/ |
18 |
|
17 |
|
19 |
LDVER?=$(shell ld -v | cut -d' ' -f1) |
18 |
LDVER?=$(shell ld -v | cut -d' ' -f1) |
Lines 51-67
Link Here
|
51 |
unix-java.h: .classes |
50 |
unix-java.h: .classes |
52 |
$(JAVAH) -classpath classes -o $@ cx.ath.matthew.unix.UnixServerSocket cx.ath.matthew.unix.UnixSocket cx.ath.matthew.unix.USInputStream cx.ath.matthew.unix.USOutputStream |
51 |
$(JAVAH) -classpath classes -o $@ cx.ath.matthew.unix.UnixServerSocket cx.ath.matthew.unix.UnixSocket cx.ath.matthew.unix.USInputStream cx.ath.matthew.unix.USOutputStream |
53 |
cgi-java.h: .classes |
52 |
cgi-java.h: .classes |
54 |
@@ -91,12 +85,10 @@ |
53 |
@@ -91,13 +85,11 @@ |
|
|
54 |
tar zcf $@ libmatthew-java-$(MATTVER) |
55 |
|
55 |
|
56 |
debug-enable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp |
56 |
debug-enable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp |
57 |
make .enabledebug |
57 |
- make .enabledebug |
58 |
- echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest |
58 |
- echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest |
59 |
- (cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class) |
59 |
- (cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class) |
|
|
60 |
+ $(MAKE) .enabledebug |
60 |
+ (cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class) |
61 |
+ (cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class) |
61 |
debug-disable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp |
62 |
debug-disable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp |
62 |
make .disabledebug |
63 |
- make .disabledebug |
63 |
- echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest |
64 |
- echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest |
64 |
- (cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class) |
65 |
- (cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class) |
|
|
66 |
+ $(MAKE) .disabledebug |
65 |
+ (cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class) |
67 |
+ (cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class) |
66 |
.enabledebug: cx/ath/matthew/debug/Debug.jpp |
68 |
.enabledebug: cx/ath/matthew/debug/Debug.jpp |
67 |
mkdir -p classes |
69 |
mkdir -p classes |