author | Rich Burridge <rich.burridge@oracle.com> |
Tue, 15 Oct 2013 05:42:39 -0700 | |
changeset 1509 | 9b41420b4385 |
parent 1275 | 03b86a2f9021 |
child 3865 | 10347aa825d2 |
permissions | -rw-r--r-- |
845
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
1 |
--- Makefile.in 2011-07-16 04:50:53.000000000 -0700 |
1275
03b86a2f9021
16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents:
845
diff
changeset
|
2 |
+++ Makefile.in 2013-03-21 09:03:57.096238407 -0700 |
845
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
3 |
@@ -85,8 +85,8 @@ |
200
936900594dba
7031770 libmng needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
4 |
swig_rb_libdir = @libdir@ |
936900594dba
7031770 libmng needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
5 |
|
936900594dba
7031770 libmng needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
6 |
### these possibly need further discussion |
936900594dba
7031770 libmng needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
7 |
-swig_pydir = @libdir@/svn-python/libsvn |
936900594dba
7031770 libmng needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
8 |
-swig_pydir_extra = @libdir@/svn-python/svn |
936900594dba
7031770 libmng needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
9 |
+swig_pydir = /usr/lib/python2.6/vendor-packages/libsvn |
936900594dba
7031770 libmng needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
10 |
+swig_pydir_extra = /usr/lib/python2.6/vendor-packages/svn |
936900594dba
7031770 libmng needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
11 |
swig_pldir = @libdir@/svn-perl |
936900594dba
7031770 libmng needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
12 |
swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext |
845
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
13 |
toolsdir = @bindir@/svn-tools |
1275
03b86a2f9021
16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents:
845
diff
changeset
|
14 |
@@ -134,8 +134,8 @@ |
03b86a2f9021
16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents:
845
diff
changeset
|
15 |
SWIG = @SWIG@ |
845
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
16 |
SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
17 |
SWIG_PY_COMPILE = @SWIG_PY_COMPILE@ |
1275
03b86a2f9021
16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents:
845
diff
changeset
|
18 |
-SWIG_PY_LINK = @SWIG_PY_LINK@ |
845
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
19 |
-SWIG_PY_LIBS = @SWIG_PY_LIBS@ |
1275
03b86a2f9021
16522397 bash in S12 should be 64-bit
Stefan Teleman <stefan.teleman@oracle.com>
parents:
845
diff
changeset
|
20 |
+SWIG_PY_LINK = @SWIG_PY_LINK@ $(CFLAGS) $(EXTRA_CFLAGS) |
845
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
21 |
+SWIG_PY_LIBS = @SWIG_PY_LIBS@ $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
22 |
SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@ |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
23 |
SWIG_RB_INCLUDES = @SWIG_RB_INCLUDES@ -I$(SWIG_SRC_DIR)/ruby/libsvn_swig_ruby |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
24 |
SWIG_RB_COMPILE = @SWIG_RB_COMPILE@ |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
25 |
@@ -180,7 +180,8 @@ |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
26 |
### suppressed (but they may come from httpd or APR). |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
27 |
CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS) |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
28 |
LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS) |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
29 |
-SWIG_LDFLAGS = @SWIG_LDFLAGS@ $(EXTRA_SWIG_LDFLAGS) |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
30 |
+EXTRA_SWIG_LDFLAGS = -R$(libdir) |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
31 |
+SWIG_LDFLAGS = @SWIG_LDFLAGS@ $(EXTRA_SWIG_LDFLAGS) $(SWIG_PY_LIBS) |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
32 |
|
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
33 |
COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
34 |
COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
35 |
@@ -209,7 +210,7 @@ |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
36 |
LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
37 |
|
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
38 |
# special link rule for mod_dav_svn |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
39 |
-LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
40 |
+LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
41 |
|
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
42 |
# Special LDFLAGS for some libraries |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
43 |
libsvn_auth_gnome_keyring_LDFLAGS = @libsvn_auth_gnome_keyring_LDFLAGS@ |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
44 |
@@ -235,7 +236,7 @@ |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
45 |
COMPILE_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(LT_CFLAGS) $(CPPFLAGS) $(SWIG_RB_INCLUDES) -prefer-pic -c -o $@ |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
46 |
|
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
47 |
# these commands link the wrapper objects into an extension library/module |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
48 |
-LINK_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_PY_LINK) $(SWIG_LDFLAGS) -rpath $(swig_pydir) -avoid-version -module |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
49 |
+LINK_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_PY_LINK) $(SWIG_LDFLAGS) $(SWIG_PY_LIBS) -rpath $(swig_pydir) -avoid-version -module |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
50 |
LINK_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_RB_LINK) $(SWIG_LDFLAGS) -rpath $(swig_rbdir) -avoid-version -module |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
51 |
|
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
52 |
LINK_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) $(LT_CXX_LIBADD) -rpath $(libdir) |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
53 |
@@ -736,7 +737,14 @@ |
206
a4474882bf60
7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
200
diff
changeset
|
54 |
./config.status subversion/bindings/swig/perl/native/Makefile.PL |
a4474882bf60
7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
200
diff
changeset
|
55 |
|
a4474882bf60
7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
200
diff
changeset
|
56 |
$(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL |
a4474882bf60
7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
200
diff
changeset
|
57 |
- cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL |
845
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
58 |
+ ( cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL ) |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
59 |
+ ( cd $(SWIG_PL_DIR)/native; \ |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
60 |
+ for file in Makefile Makefile.client Makefile.delta \ |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
61 |
+ Makefile.fs Makefile.ra Makefile.repos Makefile.wc ; do \ |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
62 |
+ cp -f $$file $$file.orig ; \ |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
63 |
+ sed -e 's;^LD_RUN_PATH.*$$;LD_RUN_PATH=/usr/lib/svn;g' $$file.orig >$$file ; \ |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
64 |
+ rm -f $$file.orig ; \ |
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
65 |
+ done ) |
206
a4474882bf60
7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
200
diff
changeset
|
66 |
|
a4474882bf60
7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
200
diff
changeset
|
67 |
# There is a "readlink -f" command on some systems for the same purpose, |
a4474882bf60
7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
200
diff
changeset
|
68 |
# but it's not as portable (e.g. Mac OS X doesn't have it). These should |
845
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
69 |
@@ -750,13 +758,13 @@ |
206
a4474882bf60
7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
200
diff
changeset
|
70 |
if test "`$(READLINK_PL) $(SWIG_PL_DIR)`" != "`$(READLINK_PL) $(SWIG_PL_SRC_DIR)`"; then \ |
a4474882bf60
7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
200
diff
changeset
|
71 |
ln -sf $(SWIG_PL_SRC_DIR)/native/*.c $(SWIG_PL_DIR)/native; \ |
a4474882bf60
7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
200
diff
changeset
|
72 |
fi |
a4474882bf60
7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
200
diff
changeset
|
73 |
- cd $(SWIG_PL_DIR)/native; $(MAKE) OPTIMIZE="" OTHERLDFLAGS="$(SWIG_LDFLAGS)" |
845
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
74 |
+ cd $(SWIG_PL_DIR)/native; $(MAKE) OPTIMIZE="" OTHERLDFLAGS="$(SWIG_LDFLAGS)" LD_RUN_PATH="/usr/lib/svn" |
206
a4474882bf60
7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
200
diff
changeset
|
75 |
|
a4474882bf60
7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
200
diff
changeset
|
76 |
check-swig-pl: swig-pl swig-pl-lib |
a4474882bf60
7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
200
diff
changeset
|
77 |
cd $(SWIG_PL_DIR)/native; $(MAKE) test |
a4474882bf60
7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
200
diff
changeset
|
78 |
|
a4474882bf60
7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
200
diff
changeset
|
79 |
install-swig-pl: swig-pl install-swig-pl-lib |
a4474882bf60
7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
200
diff
changeset
|
80 |
- cd $(SWIG_PL_DIR)/native; $(MAKE) install |
845
f38158deaa77
7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
685
diff
changeset
|
81 |
+ cd $(SWIG_PL_DIR)/native; $(MAKE) install_vendor DESTDIR=$(DESTDIR) LD_RUN_PATH="" |
206
a4474882bf60
7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
200
diff
changeset
|
82 |
|
a4474882bf60
7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
200
diff
changeset
|
83 |
EXTRACLEAN_SWIG_PL=rm -f $(SWIG_PL_SRC_DIR)/native/svn_*.c \ |
a4474882bf60
7010355 python needs to be packaged to separate out non-core dependencies
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
200
diff
changeset
|
84 |
$(SWIG_PL_SRC_DIR)/native/core.c |