janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +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

27
make/defs.mk
View file

@ -128,22 +128,23 @@ TARGET ?= Linux
ifndef ARCH
ifeq ($(shell uname -m),armv7l)
ARCH = armv7hl
SYSTEM_LIBDIR = /usr/lib
ARCH = armv7hl
SYSTEM_LIBDIR_NAME = lib
else ifeq ($(shell uname -m),armv6l)
ARCH = armv6hl
SYSTEM_LIBDIR = /usr/lib
ARCH = armv6hl
SYSTEM_LIBDIR_NAME = lib
else ifeq ($(shell uname -m),aarch64)
ARCH = aarch64
SYSTEM_LIBDIR = /usr/lib
ARCH = aarch64
SYSTEM_LIBDIR_NAME = lib
else ifeq ($(shell uname -m),x86_64)
ARCH = x86_64
SYSTEM_LIBDIR = /usr/lib64
SYSTEM_LIBDIR_NAME = lib64
else
ARCH_32 = i586
ARCH = $(ARCH_32)
SYSTEM_LIBDIR = /usr/lib
ARCH_32 = i586
ARCH = $(ARCH_32)
SYSTEM_LIBDIR_NAME = lib
endif
SYSTEM_LIBDIR = /usr/$(SYSTEM_LIBDIR_NAME)
endif
ifeq ($(ARCH),$(ARCH_32))
@ -639,11 +640,7 @@ ifeq ($(USE_QT),true)
endif
ifeq ($(USE_X),true)
ifeq ($(ARCH),$(ARCH_32))
BUILD_LDFLAGS += -L/usr/X11/lib -lXext -lX11
else
BUILD_LDFLAGS += -L/usr/X11/lib64 -lXext -lX11
endif
BUILD_LDFLAGS += -L/usr/X11/$(SYSTEM_LIBDIR_NAME) -lXext -lX11
endif
LPPFLAGS += -lstdc++

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

8
make/qt-defs.mk
View file

@ -11,11 +11,11 @@ CPPFLAGS += -DQT_THREAD_SUPPORT
#QT_MAJOR_VERSION ?= $(shell echo $(QT_VERSION) | cut -d\. -f1)
#
#ifeq ($(QT_MAJOR_VERSION),2)
# QT_PREFIX ?= /usr/lib/qt2
# QT_PREFIX ?= $(SYSTEM_LIBDIR)/qt2
# INCLUDE += -I$(QT_PREFIX)/include
#else
# ifeq ($(QT_MAJOR_VERSION),3)
# QT_PREFIX ?= /usr/lib/qt3
# QT_PREFIX ?= $(SYSTEM_LIBDIR)/qt3
# INCLUDE += -I$(QT_PREFIX)/include
# else
# ifeq ($(QT_MAJOR_VERSION),4)
@ -37,8 +37,8 @@ CPPFLAGS += -DQT_THREAD_SUPPORT
# LD_LIB_PATH += $(QT_PREFIX)/lib
# QT_LDFLAGS += -L$(QT_PREFIX)/lib
# else
# LD_LIB_PATH += $(QT_PREFIX)/lib64
# QT_LDFLAGS += -L$(QT_PREFIX)/lib64
# LD_LIB_PATH += $(QT_PREFIX)/$(SYSTEM_LIBDIR_NAME)
# QT_LDFLAGS += -L$(QT_PREFIX)/$(SYSTEM_LIBDIR_NAME)
# endif
#endif
#

2
make/swig.mk
View file

@ -21,7 +21,7 @@ ifeq ($(SWIG_TARGET),php)
SWIG_CLEAN += php_$(SWIG_MODULE_H) $(SWIG_PHP_MODULE_INI)
INCLUDE += $(addprefix -I$(SWIG_PHP_INCLUDE_DIR)/,$(SWIG_PHP_INCLUDE_SUBDIRS))
INSTALL_LIBDIR = $(ENV_PREFIX)/usr/lib64/php5/extensions
INSTALL_LIBDIR = $(ENV_PREFIX)/usr/$(SYSTEM_LIBDIR_NAME)/php5/extensions
LOCAL_CFLAGS += -Wno-unused-label -Wno-unused-function
LOCAL_CPPFLAGS += -Wno-unused-label -Wno-unused-function