git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modules - Use short command annotation in makefile ([CC] not $(CC))
[tpg/acess2.git]
/
KernelLand
/
Modules
/
Makefile.tpl
diff --git
a/KernelLand/Modules/Makefile.tpl
b/KernelLand/Modules/Makefile.tpl
index
f1c31a5
..
c96d8b0
100644
(file)
--- a/
KernelLand/Modules/Makefile.tpl
+++ b/
KernelLand/Modules/Makefile.tpl
@@
-6,14
+6,17
@@
_CPPFLAGS := $(CPPFLAGS)
-include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.cfg
-include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.cfg
-LIBINCLUDES := $(addprefix -I$(ACESSDIR)/Modules/,$(DEPS))
+LIBINCLUDES := $(addprefix -I$(ACESSDIR)/
KernelLand/
Modules/,$(DEPS))
LIBINCLUDES := $(addsuffix /include,$(LIBINCLUDES))
LIBINCLUDES := $(addsuffix /include,$(LIBINCLUDES))
-CPPFLAGS := -I$(ACESSDIR)/Kernel/include -I$(ACESSDIR)/Kernel/arch/$(ARCHDIR)/include
+CPPFLAGS := -I$(ACESSDIR)/KernelLand/Kernel/include -I$(ACESSDIR)/KernelLand/Kernel/arch/$(ARCHDIR)/include
+CPPFLAGS += -I$(ACESSDIR)/KernelLand/Modules
+CPPFLAGS += -I$(ACESSDIR)/Usermode/Libraries/ld-acess.so_src/include_exp/
CPPFLAGS += -DARCH=$(ARCH) -DARCH_is_$(ARCH) -DARCHDIR_is_$(ARCHDIR)
CPPFLAGS += $(_CPPFLAGS)
CPPFLAGS += -DARCH=$(ARCH) -DARCH_is_$(ARCH) -DARCHDIR_is_$(ARCHDIR)
CPPFLAGS += $(_CPPFLAGS)
-CPPFLAGS += $(LIBINCLUDES)
+CPPFLAGS += $(LIBINCLUDES)
-ffreestanding
CFLAGS := -std=gnu99 -Wall -fno-stack-protector -g -O3
CFLAGS := -std=gnu99 -Wall -fno-stack-protector -g -O3
+CFLAGS += -Werror -fno-omit-frame-pointer
ifneq ($(CATEGORY),)
FULLNAME := $(CATEGORY)_$(NAME)
ifneq ($(CATEGORY),)
FULLNAME := $(CATEGORY)_$(NAME)
@@
-49,27
+52,30
@@
clean:
install: $(BIN)
ifneq ($(BUILDTYPE),static)
install: $(BIN)
ifneq ($(BUILDTYPE),static)
- @$(xMKDIR) $(DISTROOT)/Modules/$(ARCH); true
- $(xCP) $(BIN) $(DISTROOT)/Modules/$(ARCH)/$(NAME).kmd
+ @$(xMKDIR) $(DISTROOT)/$(ARCH)/Modules; true
+ @gzip -c $(BIN) > $(BIN).gz
+ $(xCP) $(BIN).gz $(DISTROOT)/$(ARCH)/Modules/$(NAME).kmd.gz
else
else
+ @true
endif
ifneq ($(BUILDTYPE),static)
$(BIN): %.kmd.$(ARCH): $(OBJ)
endif
ifneq ($(BUILDTYPE),static)
$(BIN): %.kmd.$(ARCH): $(OBJ)
- @echo ---
$(LD)
-o $@
+ @echo ---
[LD]
-o $@
@$(LD) --allow-shlib-undefined -shared -nostdlib -o $@ $(OBJ) -defsym=DriverInfo=_DriverInfo_$(FULLNAME) $(LDFLAGS)
@$(DISASM) $(BIN) > $(BIN).dsm
else
$(BIN): %.xo.$(ARCH): $(OBJ)
@$(LD) --allow-shlib-undefined -shared -nostdlib -o $@ $(OBJ) -defsym=DriverInfo=_DriverInfo_$(FULLNAME) $(LDFLAGS)
@$(DISASM) $(BIN) > $(BIN).dsm
else
$(BIN): %.xo.$(ARCH): $(OBJ)
- @echo ---
$(LD)
-o $@
+ @echo ---
[LD]
-o $@
@$(LD) -r -o $@ $(OBJ) $(LDFLAGS)
endif
obj-$(_SUFFIX)/%.o: %.c Makefile $(CFGFILES)
@$(LD) -r -o $@ $(OBJ) $(LDFLAGS)
endif
obj-$(_SUFFIX)/%.o: %.c Makefile $(CFGFILES)
- @echo ---
$(CC)
-o $@
+ @echo ---
[CC]
-o $@
@mkdir -p $(dir $@)
@$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
@mkdir -p $(dir $@)
@$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
- @$(CC) -M $(CPPFLAGS) -MT $@ -o obj-$(_SUFFIX)/$*.d $<
+ @$(CC) -M $(CPPFLAGS) -MT $@ -
MP -
o obj-$(_SUFFIX)/$*.d $<
-include $(DEPFILES)
-include $(DEPFILES)
+# vim: ft=make
UCC
git Repository :: git.ucc.asn.au