janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-16 04:23:31 +01:00
Code Activity

make: Make use of $(SYSTEM_LIBDIR) variable more concise

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-09-07 10:13:03 +00:00
commit ccfc979bd0
4 changed files with 21 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
make/fc-mod-cpp.mk
View file

@ -13,10 +13,10 @@ FC_MODULE = $(FC_MODULE_BASENAME).so
#FC_GENERATE_PY=$(FC_BASE_DIR)/src/Tools/generate.py
#FC_GENERATE_PY = $(FC_PREFIX)/usr/bin/fc-generate.py
FC_GENERATE_PY = $(FC_PREFIX)/usr/lib64/FreeCAD/Tools/generate.py
FC_GENERATE_PY = $(FC_PREFIX)/usr/$(SYSTEM_LIBDIR_NAME)/FreeCAD/Tools/generate.py
FC_INSTALL_LIBDIR = $(ENV_PREFIX)/usr/lib64/FreeCAD/lib
FC_INSTALL_PYDIR = $(ENV_PREFIX)/usr/lib64/FreeCAD/Mod/$(FC_MODULE_BASENAME)
FC_INSTALL_LIBDIR = $(ENV_PREFIX)/usr/$(SYSTEM_LIBDIR_NAME)/FreeCAD/lib
FC_INSTALL_PYDIR = $(ENV_PREFIX)/usr/$(SYSTEM_LIBDIR_NAME)/FreeCAD/Mod/$(FC_MODULE_BASENAME)
FC_INSTALLED_MODULE = $(FC_INSTALL_LIBDIR)/$(FC_MODULE)
FC_INSTALLED_PYTHON = $(addprefix $(FC_INSTALL_PYDIR)/,$(FC_INIT_PY))
FC_INSTALL_DIRS = $(sort $(FC_INSTALL_LIBDIR) $(FC_INSTALL_PYDIR))
@ -26,7 +26,7 @@ FC_INSTALLED = $(FC_INSTALLED_MODULE) $(FC_INSTALLED_PYTHON)
INCLUDE += -I$(FC_PREFIX)/usr/include/FreeCAD
INCLUDE += $(shell pkg-config --cflags python QtCore) -I/usr/include/oce
#LIBFLAGS += -L$(FC_BASE_DIR)/build/lib -lFreeCADApp -lFreeCADBase
LIBFLAGS += -L$(FC_PREFIX)/usr/lib64/FreeCAD/lib -lFreeCADApp -lFreeCADBase
LIBFLAGS += -L$(FC_PREFIX)/usr/$(SYSTEM_LIBDIR_NAME)/FreeCAD/lib -lFreeCADApp -lFreeCADBase
LIBFLAGS += $(shell pkg-config --libs python QtCore)
#/usr/bin/c++ -fPIC -Wall -Wextra -Wno-write-strings -fpermissive -std=c++11 -D_OCC64 -g -DFC_DEBUG -Wl,--no-undefined -shared -Wl,-soname,Image.so -o ../../../../Mod/Image/Image.so CMakeFiles/Image.dir/ImageBase.cpp.o CMakeFiles/Image.dir/ImagePlane.cpp.o CMakeFiles/Image.dir/PreCompiled.cpp.o CMakeFiles/Image.dir/AppImage.cpp.o -Wl,-rpath,/home/jan/rpmbuild/BUILD/FreeCAD-git/build/lib: ../../../../lib/libFreeCADApp.so ../../../../lib/libFreeCADBase.so -lpython2.7 -lxerces-c -lz -lutil -ldl -lboost_filesystem -lboost_program_options -lboost_regex -lboost_signals -lboost_system -lboost_thread -lboost_chrono -lboost_date_time -lboost_atomic -lQtXml -lQtCore