blob: e19d3ad8b4b9e14e5e2009009fd1d6ebe390500e (
plain)
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
|
Description: Don't build convenience libraries in ext
Note: adapted by karamaz0v from debian patch to use after applying Arch python2-call.patch
Author: Stefano Rivera <stefanor@ubuntu.com>
Author: Graham Inggs <graham@nerve.org.za>
Forwarded: not-needed
Last-Update: 2013-09-28
--- Makefile
+++ Makefile
@@ -46,7 +46,7 @@
cd install && python2 configure.py local
config:
cd install && python2 configure.py
-p4vasp: p4vasp_config uninstallsh fltk appletlist
+p4vasp: p4vasp_config uninstallsh appletlist
cd odpdom && $(MAKE) libODP.a
cd src && $(MAKE)
p4vasp_config:
@@ -144,7 +144,7 @@
cd ext && sh clean.sh
clean: clean_p4vasp clean_odpdom
-cleanall: cleanall_p4vasp cleanall_odpdom cleanall_doc cleanall_ext
+cleanall: cleanall_p4vasp cleanall_odpdom cleanall_doc
install_pythonpkg:p4vasp
mkdir -p $(SITE_PACKAGES)/p4vasp
--- src/Configuration.mk
+++ src/Configuration.mk
@@ -1,6 +1,6 @@
-LIBS= -L../odpdom -lODP `python2 fltk-config.py --use-gl --ldstaticflags` -lpthread
+LIBS= -L../odpdom -lODP $(shell fltk-config --use-gl --ldflags) -lGLU -lGL -lm -lpthread
CFLAGS?= -g -Wall
-CFLAGS+= -fpic $(FLAGS) `python2 fltk-config.py --cxxflags` -I$(PYINCLUDE) \
+CFLAGS+= -fpic $(FLAGS) $(shell fltk-config --cxxflags) -I$(PYINCLUDE) \
-Iinclude -I../odpdom/include
PYINCLUDE=`python2 -c "import sys;import os.path;print os.path.join(sys.prefix,\"include\",\"python\"+sys.version[:3])"`
LDFLAGS+= -shared -L.
|