author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
Sat, 15 Aug 2015 10:34:08 -0700 | |
changeset 4783 | 399cd14618d4 |
parent 174 | 187aa0541610 |
permissions | -rw-r--r-- |
174
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1 |
--- python/Makefile.in 2009-07-17 07:35:22.000000000 -0700 |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
2 |
+++ python/Makefile.in 2011-03-29 18:16:55.269652847 -0700 |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
3 |
@@ -62,7 +62,7 @@ |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
4 |
_lcms_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
5 |
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
6 |
$(CXXFLAGS) $(_lcms_la_LDFLAGS) $(LDFLAGS) -o $@ |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
7 |
-@SUPPORT_PYTHON_TRUE@am__lcms_la_rpath = -rpath $(pkgdir) |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
8 |
+@SUPPORT_PYTHON_TRUE@am__lcms_la_rpath = -rpath $(libdir) |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
9 |
DEFAULT_INCLUDES = -I.@am__isrc@ |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
10 |
depcomp = $(SHELL) $(top_srcdir)/depcomp |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
11 |
am__depfiles_maybe = depfiles |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
12 |
@@ -71,7 +71,7 @@ |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
13 |
LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
14 |
--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
15 |
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
16 |
-CXXLD = $(CXX) |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
17 |
+CXXLD = $(CXX) $(CXXFLAGS) $(LDFLAGS) |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
18 |
CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
19 |
--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
20 |
$(LDFLAGS) -o $@ |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
21 |
@@ -126,7 +126,7 @@ |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
22 |
LCMS_PYEXECDIR = @LCMS_PYEXECDIR@ |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
23 |
LCMS_PYINCLUDE = @LCMS_PYINCLUDE@ |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
24 |
LCMS_PYLIB = @LCMS_PYLIB@ |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
25 |
-LD = @LD@ |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
26 |
+LD = $(CXX) $(CXXFLAGS) $(LDFLAGS) |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
27 |
LDFLAGS = @LDFLAGS@ |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
28 |
LIBOBJS = @LIBOBJS@ |
187aa0541610
7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
29 |
LIBRARY_AGE = @LIBRARY_AGE@ |