i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

makefile-engine: fixed build of kernel add-ons.

Browse Source 
* Actually, hopefully: not yet tested.
* Automatic whitespace cleanup.
This commit is contained in:
Axel Dörfler
2014-03-25 23:36:26 +01:00
parent d941d6bac3
commit bff2690587
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/develop/makefile-engine
+7 -7
View File
@@ -2,7 +2,7 @@
## Does all the hard work for the Generic Makefile ## Does all the hard work for the Generic Makefile
## which simply defines the project parameters ## which simply defines the project parameters
## Supports Generic Makefile v2.0, 2.01, 2.1, 2.2, 2.3, 2.4, 2.5 ## Supports Generic Makefile v2.0, 2.01, 2.1, 2.2, 2.3, 2.4, 2.5
# determine wheather running on x86 or ppc # determine wheather running on x86 or ppc
MACHINE=$(shell uname -m) MACHINE=$(shell uname -m)
@@ -96,8 +96,8 @@ endif
LDFLAGS += -shared -Xlinker -soname=$(NAME) LDFLAGS += -shared -Xlinker -soname=$(NAME)
else else
ifeq ($(strip $(TYPE)), DRIVER) ifeq ($(strip $(TYPE)), DRIVER)
LDFLAGS += -nostdlib /boot/develop/lib/x86/_KERNEL_ \ LDFLAGS += -nostdlib /boot/system/develop/lib/_KERNEL_ \
/boot/develop/lib/x86/haiku_version_glue.o /boot/system/develop/lib/haiku_version_glue.o
endif endif
endif endif
endif endif
@@ -117,7 +117,7 @@ endif
# quotation marks # quotation marks
ifeq ($(strip $(TYPE)), STATIC) ifeq ($(strip $(TYPE)), STATIC)
TARGET := $(TARGET_DIR)/$(NAME).a TARGET := $(TARGET_DIR)/$(NAME).a
else else
TARGET := $(TARGET_DIR)/$(NAME) TARGET := $(TARGET_DIR)/$(NAME)
endif endif
@@ -154,13 +154,13 @@ ifneq (,$(filter $(CPU),x86 x86_64))
INCLUDES = $(LOC_INCLUDES) INCLUDES = $(LOC_INCLUDES)
INCLUDES += -I- INCLUDES += -I-
INCLUDES += $(foreach path, $(SYSTEM_INCLUDE_PATHS), $(addprefix -I, $(path))) INCLUDES += $(foreach path, $(SYSTEM_INCLUDE_PATHS), $(addprefix -I, $(path)))
STDCPPLIBS = stdc++.r4 STDCPPLIBS = stdc++.r4
else else
INCLUDES = -iquote./ INCLUDES = -iquote./
INCLUDES += $(foreach path, $(SRC_PATHS) $(LOCAL_INCLUDE_PATHS), $(addprefix -iquote, $(path))) INCLUDES += $(foreach path, $(SRC_PATHS) $(LOCAL_INCLUDE_PATHS), $(addprefix -iquote, $(path)))
INCLUDES += $(foreach path, $(SYSTEM_INCLUDE_PATHS), $(addprefix -isystem, $(path))) INCLUDES += $(foreach path, $(SYSTEM_INCLUDE_PATHS), $(addprefix -isystem, $(path)))
STDCPPLIBS = stdc++ supc++ STDCPPLIBS = stdc++ supc++
endif endif
else else
@@ -317,7 +317,7 @@ $(OBJ_DIR)/%.rsrc : %.RDEF
$(CATALOGS_DIR)/%.catalog : $(CATKEYS_DIR)/%.catkeys $(CATALOGS_DIR)/%.catalog : $(CATKEYS_DIR)/%.catkeys
linkcatkeys -o "$@" -s $(APP_MIME_SIG) -l $(notdir $(basename $@)) $< linkcatkeys -o "$@" -s $(APP_MIME_SIG) -l $(notdir $(basename $@)) $<
# rule to preprocess program sources into file ready for collecting catkeys # rule to preprocess program sources into file ready for collecting catkeys
$(OBJ_DIR)/$(NAME).pre : $(SRCS) $(OBJ_DIR)/$(NAME).pre : $(SRCS)
-cat $(SRCS) | $(CC) -E -x c++ $(INCLUDES) $(CFLAGS) -DB_COLLECTING_CATKEYS - > $(OBJ_DIR)/$(NAME).pre -cat $(SRCS) | $(CC) -E -x c++ $(INCLUDES) $(CFLAGS) -DB_COLLECTING_CATKEYS - > $(OBJ_DIR)/$(NAME).pre