author | Rich Burridge <rich.burridge@oracle.com> |
Wed, 18 Apr 2012 11:08:05 -0700 | |
changeset 778 | 9d5e4d6466cd |
parent 204 | 78dfe4707c7c |
permissions | -rw-r--r-- |
778
9d5e4d6466cd
7161375 Update gnuplot to version 4.6.0
Rich Burridge <rich.burridge@oracle.com>
parents:
204
diff
changeset
|
1 |
--- gnuplot-4.6.0/src/Makefile.am.orig 2012-04-14 17:52:42.203033478 -0700 |
9d5e4d6466cd
7161375 Update gnuplot to version 4.6.0
Rich Burridge <rich.burridge@oracle.com>
parents:
204
diff
changeset
|
2 |
+++ gnuplot-4.6.0/src/Makefile.am 2012-04-14 17:53:57.604828972 -0700 |
9d5e4d6466cd
7161375 Update gnuplot to version 4.6.0
Rich Burridge <rich.burridge@oracle.com>
parents:
204
diff
changeset
|
3 |
@@ -57,7 +57,7 @@ |
204
78dfe4707c7c
7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
4 |
template.h term_api.h term.c term.h time.c unset.c util.c util.h \ |
78dfe4707c7c
7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
5 |
util3d.c util3d.h variable.c variable.h version.c version.h |
78dfe4707c7c
7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
6 |
|
778
9d5e4d6466cd
7161375 Update gnuplot to version 4.6.0
Rich Burridge <rich.burridge@oracle.com>
parents:
204
diff
changeset
|
7 |
-gnuplot_LDADD = $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS) |
9d5e4d6466cd
7161375 Update gnuplot to version 4.6.0
Rich Burridge <rich.burridge@oracle.com>
parents:
204
diff
changeset
|
8 |
+gnuplot_LDADD = $(shell echo -lpng $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS) | sed -e s,-lpng[0123456789]*,-lpng12,g) |
204
78dfe4707c7c
7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
9 |
|
78dfe4707c7c
7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
10 |
pkglibexec_PROGRAMS = |
78dfe4707c7c
7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
11 |
|
778
9d5e4d6466cd
7161375 Update gnuplot to version 4.6.0
Rich Burridge <rich.burridge@oracle.com>
parents:
204
diff
changeset
|
12 |
--- gnuplot-4.6.0/src/Makefile.in.orig 2012-04-14 17:55:00.314759690 -0700 |
9d5e4d6466cd
7161375 Update gnuplot to version 4.6.0
Rich Burridge <rich.burridge@oracle.com>
parents:
204
diff
changeset
|
13 |
+++ gnuplot-4.6.0/src/Makefile.in 2012-04-14 17:55:41.703140495 -0700 |
9d5e4d6466cd
7161375 Update gnuplot to version 4.6.0
Rich Burridge <rich.burridge@oracle.com>
parents:
204
diff
changeset
|
14 |
@@ -431,7 +431,7 @@ |
9d5e4d6466cd
7161375 Update gnuplot to version 4.6.0
Rich Burridge <rich.burridge@oracle.com>
parents:
204
diff
changeset
|
15 |
util.c util.h util3d.c util3d.h variable.c variable.h \ |
9d5e4d6466cd
7161375 Update gnuplot to version 4.6.0
Rich Burridge <rich.burridge@oracle.com>
parents:
204
diff
changeset
|
16 |
version.c version.h $(am__append_2) $(am__append_3) \ |
9d5e4d6466cd
7161375 Update gnuplot to version 4.6.0
Rich Burridge <rich.burridge@oracle.com>
parents:
204
diff
changeset
|
17 |
$(am__append_4) $(am__append_6) |
9d5e4d6466cd
7161375 Update gnuplot to version 4.6.0
Rich Burridge <rich.burridge@oracle.com>
parents:
204
diff
changeset
|
18 |
-gnuplot_LDADD = $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS) |
9d5e4d6466cd
7161375 Update gnuplot to version 4.6.0
Rich Burridge <rich.burridge@oracle.com>
parents:
204
diff
changeset
|
19 |
+gnuplot_LDADD = $(shell echo -lpng $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS) | sed -e s,-lpng[0123456789]*,-lpng12,g) |
9d5e4d6466cd
7161375 Update gnuplot to version 4.6.0
Rich Burridge <rich.burridge@oracle.com>
parents:
204
diff
changeset
|
20 |
@BUILD_GNUPLOT_X11_TRUE@gnuplot_x11_SOURCES = gplt_x11.c gplt_x11.h gpexecute.c gpexecute.h mousecmn.h version.c version.h |
204
78dfe4707c7c
7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
21 |
@BUILD_GNUPLOT_X11_TRUE@XLIBS = @LIBRARIES_FOR_X@ |
78dfe4707c7c
7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
22 |
@BUILD_GNUPLOT_X11_TRUE@gnuplot_x11_LDADD = getcolor_x11.o $(XLIBS) |