1 |
slords |
1.1 |
--- Makefile 2007-09-22 17:00:26.000000000 +0200 |
2 |
|
|
+++ Makefile.mod 2007-09-22 17:02:55.000000000 +0200 |
3 |
|
|
@@ -159,19 +159,19 @@ |
4 |
|
|
#PYTHON=$(PREFIX_PYTHON)/bin/python |
5 |
|
|
|
6 |
|
|
# RHEL or CentOS 5 Linux |
7 |
|
|
-#PREFIX=/usr |
8 |
|
|
-#PREFIX_PYTHON=$(PREFIX) |
9 |
|
|
-#PYTHON_VER=2.4 |
10 |
|
|
-#DB_VER=4.3.29 |
11 |
|
|
-#LIBDIR_NAME=lib |
12 |
|
|
-#GCJ_HOME=/usr |
13 |
|
|
-#GCJ_LIBDIR=$(GCJ_HOME)/$(LIBDIR_NAME) |
14 |
|
|
+PREFIX=/usr |
15 |
|
|
+PREFIX_PYTHON=$(PREFIX) |
16 |
|
|
+PYTHON_VER=2.4 |
17 |
|
|
+DB_VER=4.3.29 |
18 |
|
|
+#LIBDIR_NAME=$(LIBDIR) |
19 |
|
|
+GCJ_HOME=/usr |
20 |
|
|
+GCJ_LIBDIR=$(GCJ_HOME)/$(LIBDIR_NAME) |
21 |
|
|
#GCJ_STATIC= |
22 |
|
|
#LIB_INSTALL= |
23 |
|
|
#DB= |
24 |
|
|
#PREFIX_DB=$(PREFIX) |
25 |
|
|
-#ANT=ant |
26 |
|
|
-#PYTHON=$(PREFIX_PYTHON)/bin/python |
27 |
|
|
+ANT=ant |
28 |
|
|
+PYTHON=$(PREFIX_PYTHON)/bin/python |
29 |
|
|
|
30 |
|
|
# Linux 64 (with gcc 4.2.0 and libgcj dynamically linked) |
31 |
|
|
#PREFIX=/usr/local |
32 |
|
|
@@ -799,7 +799,7 @@ |
33 |
|
|
ld -dynamic -bundle -o $@ $(LDFLAGS) $(JAVA_OBJS) $(CPP_OBJS) /usr/$(LIBDIR_NAME)/bundle1.o -L$(GCJ_LIBDIR) -framework System -bundle_loader $(PREFIX_FRAMEWORKS)/Python.framework/Versions/$(PYTHON_VER)/bin/python$(_SUFFIX) -F$(PREFIX_FRAMEWORKS) -framework Python -lgcj -lgcc_s$(LIBGCC_S_VER) -liconv -lstdc++ $(STUBS) -multiply_defined suppress |
34 |
|
|
endif |
35 |
|
|
ifneq ($(DEBUG),1) |
36 |
|
|
- $(STRIP) $@ |
37 |
|
|
+# $(STRIP) $@ |
38 |
|
|
endif |
39 |
|
|
else |
40 |
|
|
|
41 |
|
|
@@ -811,7 +811,7 @@ |
42 |
|
|
$(CXX) -shared -o $@ $(LDFLAGS) $(JAVA_OBJS) $(CPP_OBJS) -L$(GCJ_LIBDIR) -lgcj |
43 |
|
|
endif |
44 |
|
|
ifneq ($(DEBUG),1) |
45 |
|
|
- $(STRIP) $@ |
46 |
|
|
+# $(STRIP) $@ |
47 |
|
|
endif |
48 |
|
|
else |
49 |
|
|
|
50 |
|
|
@@ -851,9 +851,9 @@ |
51 |
|
|
install $(GCJ_LIBDIR)/$$lib $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME); \ |
52 |
|
|
done |
53 |
|
|
ifneq ($(DEBUG),1) |
54 |
|
|
- for lib in $(LIB_INSTALL); do \ |
55 |
|
|
- $(STRIP) $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)/$$lib; \ |
56 |
|
|
- done |
57 |
|
|
+# for lib in $(LIB_INSTALL); do \ |
58 |
|
|
+# $(STRIP) $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)/$$lib; \ |
59 |
|
|
+# done |
60 |
|
|
endif |
61 |
|
|
endif |
62 |
|
|
|
63 |
|
|
@@ -918,9 +918,9 @@ |
64 |
|
|
install $(GCJ_LIBDIR)/$$lib $(DISTRIB)/gcj; \ |
65 |
|
|
done |
66 |
|
|
ifneq ($(DEBUG),1) |
67 |
|
|
- for lib in $(LIB_INSTALL); do \ |
68 |
|
|
- $(STRIP) $(DISTRIB)/gcj/$$lib; \ |
69 |
|
|
- done |
70 |
|
|
+# for lib in $(LIB_INSTALL); do \ |
71 |
|
|
+# $(STRIP) $(DISTRIB)/gcj/$$lib; \ |
72 |
|
|
+# done |
73 |
|
|
endif |
74 |
|
|
endif |
75 |
|
|
|