Fixed sysless rules and added first aproach to linux rules.

[omk.git] / snippets / gcc

diff --git a/snippets/gcc b/snippets/gcc
index 2ca832678afa885927ba094f5675bd8b256b8c8f..4b1b5d81a4cce15f032d9e698208501f1c518e43 100644 (file)
--- a/snippets/gcc
+++ b/snippets/gcc
@@ -42,7 +42,7 @@ NM = $(CROSS_COMPILE)nm
 CFLAGS += $(TARGET_ARCH) $(DEBUG) $(OPTIMIZE)
 CFLAGS += -Wall
 CFLAGS += -I$(SOURCES_DIR)
-CFLAGS += -I$(INCLUDE_DIR) -DOMK_FOR_TARGET
+CFLAGS += -I$(INCLUDE_DIR)
 
 LOADLIBES += -L$(LIB_DIR)
 LOADLIBES += $(lib_LOADLIBES:%=-l%)
@@ -141,26 +141,22 @@ $(1)_OBJS := $$(sort $$($(1)_OBJS))
 
 SOURCES += $$($(1)_SOURCES)
 
-# Shortcuts for use in this template 
-_LNK_VAR := $(addprefix -,$(3))
-_TARGET := $(1)$$(_LNK_VAR)
-
 ifneq ($(LD_SCRIPT),)
-$$(_TARGET)_LDFLAGS = -Wl,-T,$(LD_SCRIPT).ld$$(_LNK_VAR)
+$(1)$(3:%=-%)_LDFLAGS = -Wl,-T,$(LD_SCRIPT).ld$(3:%=-%)
 endif
 
-$(2)/$$(_TARGET): $$($(1)_OBJS)
+$(2)/$(1)$(3:%=-%): $$($(1)_OBJS)
        @$(QUIET_CMD_ECHO) "  LINK    $$@"
        $(Q) $$(shell if [ -z "$$(filter %.cc,$$($(1)_SOURCES))" ] ; \
          then echo $$(CC)  $$(CPPFLAGS) $$(AM_CPPFLAGS) $$(AM_CFLAGS)   $$(CFLAGS) ; \
          else echo $$(CXX) $$(CPPFLAGS) $$(AM_CPPFLAGS) $$(AM_CXXFLAGS) $$(CXXFLAGS) ; fi) \
-         $$(AM_LDFLAGS) $$(LDFLAGS) $$($$(_TARGET)_LDFLAGS) -Wl,-Map,$$(_TARGET).map \
+         $$(AM_LDFLAGS) $$(LDFLAGS) $$($(1)$(3:%=-%)_LDFLAGS) -Wl,-Map,$(1)$(3:%=-%).map \
          $$($(1)_OBJS) $$(LOADLIBES) $$($(1)_MOREOBJS) $$($(1)_LIBS:%=-l%) \
          -o $$@
-       @echo "$(2)/$$(_TARGET): \\" >$(OBJS_DIR)/$$(_TARGET).exe.d
+       @echo "$(2)/$(1)$(3:%=-%): \\" >$(OBJS_DIR)/$(1)$(3:%=-%).exe.d
        @if [ -n "$(LD_SCRIPT)" ]; then \
-         echo "  $(LIB_DIR)/$(LD_SCRIPT).ld$$(_LNK_VAR) \\" >>$(OBJS_DIR)/$$(_TARGET).exe.d; fi
-       @sed -n -e 's/^LOAD \(.*\)$$$$/  \1  \\/p' $(OBJS_DIR)/$$(_TARGET).map  >>$(OBJS_DIR)/$$(_TARGET).exe.d
+         echo "  $(LIB_DIR)/$(LD_SCRIPT).ld$(3:%=-%) \\" >>$(OBJS_DIR)/$(1)$(3:%=-%).exe.d; fi
+       @sed -n -e 's/^LOAD \(.*\)$$$$/  \1  \\/p' $(OBJS_DIR)/$(1)$(3:%=-%).map  >>$(OBJS_DIR)/$(1)$(3:%=-%).exe.d
        @echo >>$(OBJS_DIR)/$(1).exe.d
 endef