summaryrefslogtreecommitdiff
path: root/cad/netgen/files/patch-Makefile
blob: 41b7a480a74bbb649bbd90f44da3f870909c6e7b (plain) (blame)
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
--- Makefile.orig	Thu Feb 12 11:46:45 2004
+++ Makefile	Mon May  3 21:56:38 2004
@@ -16,13 +16,13 @@
 # system libraries:
 #
 # olymp
-  tcltklib = -ltix8.1.8.4 -ltk8.4  -ltcl8.4
+tcltklib = `echo $(TIX_BUILD_LIB_SPEC)` `echo $(TK_LIB_SPEC)` `echo $(TCL_LIB_FLAG)`
 #tcltklib = -L. -ltix8.1.8.4 -ltk8.4 -ltcl8.4
 # tcltklib = -ltix4.1.8.0 -ltk8.0 -ltcl8.0
 # tcltklib = -ltix8.2 -ltk8.3 -ltcl8.3
 #
 #
-syslib = $(tcltklib)  -lGL -lGLU -lX11  -lXi -lm  -ldl -lpthread $(SYSLIB2) 
+syslib = $(tcltklib)  -lGL -lGLU -lX11 -lXi -lm $(PTHREAD_LIBS) $(SYSLIB2)
 # (maybe you have to remove -ldl)
 #
 #
@@ -33,9 +33,7 @@
 OCCINC_DIR=$(OCC_DIR)/inc
 OCCLIB_DIR=$(OCC_DIR)/lib
 #
-# occlib = -L$(OCCLIB_DIR) -lTKIGES -lTKBRep -lTKSTEP 
-#
-CPLUSPLUSFLAGS3 = -I$(LIBSRC_DIR)/step
+# occlib = -L$(OCCLIB_DIR) -lTKIGES -lTKBRep -lTKSTEP
 #
 include $(LIBSRC_DIR)/makefile.mach.$(MACHINE)
 #
@@ -44,7 +42,7 @@
 .SUFFIXES: .cpp .o
 #
 #
-CPLUSPLUSFLAGS1 = -c -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR) -DOPENGL
+CPLUSPLUSFLAGS1 = -c -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR) -DOPENGL $(PTHREAD_CFLAGS)
 LINKFLAGS1 =   -lGL -lGLU -lX11 -lXext -lXmu
 #
 #
@@ -59,7 +57,7 @@
 # Additional NETGEN Applications:
 #
 # the demo add-on application:
-# appdemo = -L./demoapp -ldemoapp
+appdemo = -L./demoapp -ldemoapp
 #
 # appaddon = -L./addon -laddon
 
@@ -86,7 +84,7 @@
 	cd libsrc; $(MAKE)
 #
 applib:
-#	cd demoapp; $(MAKE);
+	cd demoapp; $(MAKE);
 #	cd addon; $(MAKE)
 #	cd ngsolve; $(MAKE);
 #	cd metis; $(MAKE)