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
|
From: Ole Streicher <olebole@debian.org>
Date: Wed, 10 May 2017 09:48:49 +0200
Subject: Use external giza library instead of local copy
---
build/Makefile | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/build/Makefile b/build/Makefile
index 7596ccb..854863d 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -37,8 +37,8 @@ FFLAGS=
# (some settings of the SYSTEM variable for specific machines overwrite this)
#
# X11_LIBS= -L/usr/X11R6/lib64 -lX11
-X11_DIR= /usr/X11/
-X11_LIBS= -L$(X11_DIR)/lib -lX11
+# X11_DIR= /usr/X11/
+#X11_LIBS= -L$(X11_DIR)/lib -lX11
X11_CFLAGS= -I$(X11_DIR)/include
CAIRO_LIBS= -L$(X11_DIR)/lib -lcairo
CAIRO_CFLAGS= -I$(X11_DIR)/include
@@ -167,6 +167,7 @@ ifeq ($(SYSTEM), gfortran)
OMPFLAGS= -fopenmp
ENDIANFLAGBIG= -fconvert=big-endian
ENDIANFLAGLITTLE= -fconvert=little-endian
+ PGPLOTLIBS= -lgiza
KNOWN_SYSTEM=yes
endif
@@ -785,8 +786,8 @@ plotlib_pgplot.o: checkpgplot
plotlib_giza.o : giza-fortran.o
-giza-fortran.o : giza-fortran.F90
- $(FC) $(FFLAGS) -I$(GIZA_DIR)/include/ -c $(GIZA_DIR)/include/giza-fortran.F90 -o $@
+giza-fortran.o : /usr/include/giza-fortran.F90
+ $(FC) $(FFLAGS) -c $< -o $@
.PHONY: giza gizabuild libgiza
|
