1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
|
--- makemake.orig 2008-11-07 12:53:03.000000000 +0000
+++ makemake 2008-11-07 12:52:33.000000000 +0000
@@ -73,7 +73,7 @@
# List the default make targets.
-DEFAULT_TARGETS="lib grfont.dat prog pgplot.doc"
+DEFAULT_TARGETS="lib grfont.dat pgplot.doc"
# Get the configuration variables.
@@ -199,17 +199,17 @@
fi
if (echo $DRIV_LIST | grep -s xmdriv 2>&1 1>/dev/null); then
- DEFAULT_TARGETS="$DEFAULT_TARGETS libXmPgplot.a pgmdemo"
+ DEFAULT_TARGETS="$DEFAULT_TARGETS libXmPgplot.a"
INSTALL_LIST="$INSTALL_LIST libXmPgplot.a XmPgplot.h"
fi
if (echo $DRIV_LIST | grep -s xadriv 2>&1 1>/dev/null); then
- DEFAULT_TARGETS="$DEFAULT_TARGETS libXaPgplot.a pgawdemo"
+ DEFAULT_TARGETS="$DEFAULT_TARGETS libXaPgplot.a"
INSTALL_LIST="$INSTALL_LIST libXaPgplot.a XaPgplot.h"
fi
if (echo $DRIV_LIST | grep -s tkdriv 2>&1 1>/dev/null); then
- DEFAULT_TARGETS="$DEFAULT_TARGETS libtkpgplot.a pgtkdemo pgtkdemo.tcl"
+ DEFAULT_TARGETS="$DEFAULT_TARGETS libtkpgplot.a"
INSTALL_LIST="$INSTALL_LIST libtkpgplot.a tkpgplot.h"
fi
@@ -622,7 +622,7 @@
# Fortran compiler and compilation flags
#
FCOMPL=$FCOMPL
-FFLAGC=$FFLAGC
+FFLAGC=$FFLAGC \$(FFLAGS)
FFLAGD=$FFLAGD
#
# C compiler and compilation flags
@@ -633,7 +633,7 @@
TK_INCL=$TK_INCL
RV_INCL=$RV_INCL
CCOMPL=$CCOMPL
-CFLAGC=$CFLAGC -I.
+CFLAGC=$CFLAGC -I. \$(CFLAGS)
CFLAGD=$CFLAGD
MCOMPL=$MCOMPL
MFLAGC=$MFLAGC
@@ -657,7 +657,10 @@
# Shared library creation.
#
SHARED_LIB=$SHARED_LIB
+SHARED_CLIB=$SHARED_CLIB
SHARED_LD=$SHARED_LD
+SHARED_LD_PGPLOT_OPTS=$SHARED_LD_PGPLOT_OPTS
+SHARED_LD_CPGPLOT_OPTS=$SHARED_LD_CPGPLOT_OPTS
#
# The libraries that the shared PGPLOT library depends upon.
# This is for systems that allow one to specify what libraries
@@ -806,7 +809,8 @@
# libraries.
#-----------------------------------------------------------------------
-lib : libpgplot.a $(SHARED_LIB)
+#lib : libpgplot.a $(SHARED_LIB)
+lib : libpgplot.a
libpgplot.a : $(PG_ROUTINES) $(PG_NON_STANDARD) $(GR_ROUTINES) \
$(DISPATCH_ROUTINE) $(DRIVERS) $(SYSTEM_ROUTINES)
@@ -816,6 +820,16 @@
$(DRIVERS) $(SYSTEM_ROUTINES) | sort | uniq`
$(RANLIB) libpgplot.a
+#shared: $(PG_ROUTINES) $(PG_NON_STANDARD) $(GR_ROUTINES) \
+# $(DISPATCH_ROUTINE) $(DRIVERS) $(SYSTEM_ROUTINES)
+# $(SHARED_LD)
+
+shared: $(PG_ROUTINES) $(PG_NON_STANDARD) \
+ $(GR_ROUTINES) $(DISPATCH_ROUTINE) $(DRIVERS) $(SYSTEM_ROUTINES)
+ $(SHARED_LD) $(SHARED_LD_PGPLOT_OPTS) `ls $(PG_ROUTINES) \
+ $(PG_NON_STANDARD) $(GR_ROUTINES) $(DISPATCH_ROUTINE) \
+ $(DRIVERS) $(SYSTEM_ROUTINES) | sort | uniq` $(SHARED_LIB_LIBS)
+ ln -s $(SHARED_LIB) libpgplot.so
EOD
# Emit the shared library dependency if requested.
@@ -824,7 +838,7 @@
cat >> makefile << \EOD
$(SHARED_LIB): $(PG_ROUTINES) $(PG_NON_STANDARD) \
$(GR_ROUTINES) $(DISPATCH_ROUTINE) $(DRIVERS) $(SYSTEM_ROUTINES)
- $(SHARED_LD) `ls $(PG_ROUTINES) \
+ $(SHARED_LD) $(SHARED_LD_PGPLOT_OPTS) `ls $(PG_ROUTINES) \
$(PG_NON_STANDARD) $(GR_ROUTINES) $(DISPATCH_ROUTINE) \
$(DRIVERS) $(SYSTEM_ROUTINES) | sort | uniq` $(SHARED_LIB_LIBS)
EOD
@@ -1025,12 +1039,12 @@
grivas.o : $(DRVDIR)/gadef.h
grtv00.o : $(DRVDIR)/imdef.h
pgxwin.o : $(DRVDIR)/pgxwin.h
-pndriv.o : ./png.h ./pngconf.h ./zlib.h ./zconf.h
+pndriv.o : /usr/include/png.h /usr/include/pngconf.h /usr/include/zlib.h /usr/include/zconf.h
x2driv.o figdisp_comm.o: $(DRVDIR)/commands.h
-cpg: libcpgplot.a cpgplot.h cpgdemo
+cpg: cpgplot.h libcpgplot.a
@echo ' '
@echo '*** Finished compilation of the C PGPLOT wrapper library ***'
@echo ' '
@@ -1039,17 +1053,29 @@
@echo 'will be needed.'
@echo ' '
+cpg-shared: libcpgplot.so
+
pgbind: $(SRC)/cpg/pgbind.c
$(CCOMPL) $(CFLAGC) $(SRC)/cpg/pgbind.c -o pgbind
-libcpgplot.a cpgplot.h: $(PG_SOURCE) pgbind
+cpgplot.h: $(PG_SOURCE) pgbind
./pgbind $(PGBIND_FLAGS) -h -w $(PG_SOURCE)
+
+libcpgplot.a: cpgplot.h
$(CCOMPL) -c $(CFLAGC) cpg*.c
rm -f cpg*.c
ar ru libcpgplot.a cpg*.o
$(RANLIB) libcpgplot.a
rm -f cpg*.o
+libcpgplot.so: $(PG_SOURCE) pgbind
+ ./pgbind $(PGBIND_FLAGS) -w $(PG_SOURCE)
+ $(CCOMPL) -c $(CFLAGC) cpg*.c
+ rm -f cpg*.c
+ $(SHARED_LD) $(SHARED_LD_CPGPLOT_OPTS) cpg*.o -lpgplot $(SHARED_LIB_LIBS)
+ ln -s $(SHARED_CLIB) libcpgplot.so
+ rm -f cpg*.o
+
cpgdemo: cpgplot.h $(SRC)/cpg/cpgdemo.c libcpgplot.a
$(CCOMPL) $(CFLAGD) -c -I. $(SRC)/cpg/cpgdemo.c
$(FCOMPL) -o cpgdemo cpgdemo.o $(CPGPLOT_LIB) $(LIBS)
|
GitWeb