haikuprojects/Yab2Cpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean-up makefile

Browse Source
This commit is contained in:
Jim Saxton
2016-02-07 10:36:10 -08:00
parent 309914cada
commit 52e0eea2ce
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Makefile
View File

@@ -16,19 +16,24 @@
## ##
HAIKUTAB = YabTabView.o HAIKUTAB = YabTabView.o
HAIKUOPT = -DHAIKU -DLIBRARY_PATH=\"`finddir B_USER_SETTINGS_DIRECTORY`/yab\" HAIKUOPT = -DHAIKU -DLIBRARY_PATH=\"`finddir B_USER_SETTINGS_DIRECTORY`/yab\"
#
## find haiku systenm archetecture ##
## Find haiku systenm archetecture from the package file name
##
SYSTEMARCH:= $(shell catattr SYS:PACKAGE_FILE /boot/system/kernel_x86|cut --fields=4 -d-|cut -d. --fields 1) SYSTEMARCH:= $(shell catattr SYS:PACKAGE_FILE /boot/system/kernel_x86|cut --fields=4 -d-|cut -d. --fields 1)
## find used archetecture #
USEDARCH := $(shell getarch)
##
## Find used archetecture using the getarch command
##
USEDARCH := $(shell getarch)
ifeq ($(SYSTEMARCH),$(USEDARCH)) ifeq ($(SYSTEMARCH),$(USEDARCH))
ARCHADD:= ARCHADD:=
else else
ARCHADD := /$(USEDARCH) ARCHADD := /$(USEDARCH)
endif endif
#
## ##
## Use our own column list view ## Use our own column list view
@@ -47,7 +52,7 @@ COLUMN = column/ColumnListView.o
OPT = -O OPT = -O
# #
## ##
## select libtrary name ## set libtrary name
## ##
YABLIBRARY := libyab.so YABLIBRARY := libyab.so
## ##
@@ -61,14 +66,15 @@ GCC = gcc
GCC_OPT = $(DBG) $(OPT) -I. -I/boot/home/config/include/ -I/boot/home/config/include/ncurses/ -DHAVE_CONFIG -DUNIX $(HAIKUOPT) GCC_OPT = $(DBG) $(OPT) -I. -I/boot/home/config/include/ -I/boot/home/config/include/ncurses/ -DHAVE_CONFIG -DUNIX $(HAIKUOPT)
GPP = g++ GPP = g++
GPP_OPT = $(DBG) $(OPT) -I. -DHAVE_CONFIG -DUNIX $(HAIKUOPT) GPP_OPT = $(DBG) $(OPT) -I. -DHAVE_CONFIG -DUNIX $(HAIKUOPT)
##GCC_VER_GTE48 := $(shell echo `gcc -dumpversion | cut -f1-2 -d.` \>= 4.8 | bc ) ##
## find out if we need to change the library to libyab_x86.so and use gcc instead of ld
ifeq ($(USEDARCH), x86) ifeq ($(USEDARCH), x86)
LD = gcc LD = gcc
YABLIBRARY:=libyab_x86.so YABLIBRARY:=libyab_x86.so
else else
LD = ld LD = ld
endif endif
#
LD_OPT = -shared LD_OPT = -shared