From 544a4da57c097ec59fed4c99ad2681bf10cd3817 Mon Sep 17 00:00:00 2001 From: Maschell Date: Tue, 13 Mar 2018 10:15:48 +0100 Subject: [PATCH] [Makefile] Added LD flags to the makefile.mk, removed unneeded directory in EXTERNAL_INCLUDE --- ide_templates/codeblocks/Makefile | 11 ++++++----- ide_templates/codeblocks/makefile.mk | 11 ++++++++--- plugins/example_plugin/Makefile | 6 +++--- plugins/example_plugin/makefile.mk | 11 ++++++++--- plugins/hid_to_vpad/Makefile | 6 +++--- plugins/hid_to_vpad/makefile.mk | 11 ++++++++--- plugins/memory_info/Makefile | 6 +++--- plugins/memory_info/makefile.mk | 11 ++++++++--- plugins/nnu_patcher/Makefile | 6 +++--- plugins/nnu_patcher/makefile.mk | 11 ++++++++--- plugins/overlay/Makefile | 6 +++--- plugins/overlay/makefile.mk | 11 ++++++++--- plugins/padcon/Makefile | 6 +++--- plugins/padcon/makefile.mk | 12 +++++++++--- plugins/screenshot/Makefile | 6 +++--- plugins/screenshot/makefile.mk | 11 ++++++++--- plugins/sdcafiine/Makefile | 6 +++--- plugins/sdcafiine/makefile.mk | 13 +++++++++---- plugins/swipswapme/Makefile | 6 +++--- plugins/swipswapme/makefile.mk | 11 ++++++++--- 20 files changed, 115 insertions(+), 63 deletions(-) diff --git a/ide_templates/codeblocks/Makefile b/ide_templates/codeblocks/Makefile index e70eef7..09c3f4b 100644 --- a/ide_templates/codeblocks/Makefile +++ b/ide_templates/codeblocks/Makefile @@ -1,4 +1,5 @@ - +# You probably never need to adjust this Makefile. +# All changes can be done in the makefile.mk #--------------------------------------------------------------------------------- # Clear the implicit built in rules @@ -81,8 +82,8 @@ endif ASFLAGS += LDFLAG_COMMON += -LDFLAGS_MOD += -LDFLAGS_ELF += +LDFLAGS_MOD += $(LD_FLAGS_MOD) +LDFLAGS_ELF += $(LD_FLAGS_ELF) #--------------------------------------------------------------------------------- Q := @ @@ -180,7 +181,7 @@ all : $(OUTPUT) # Rule to make the module file. $(OUTPUT) : output.elf @echo "checking for missing symbols ..." - @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAG_COMMON) $(ALL_LIBS) $(LIBPATHS_FULL) -o check_linking.elf + @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAG_COMMON) $(LD_FLAGS_MOD) $(ALL_LIBS) $(LIBPATHS_FULL) -o check_linking.elf @echo "linking ..." $@ @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAGS_MOD) $(ALL_LIBS) $(LIBPATHS_FULL) -o $@ @@ -206,7 +207,7 @@ output.elf : $(OFILES) #--------------------------------------------------------------------------------- %.o: %.c @echo $(notdir $<) - $(CC) -MMD -MP -MF $(DEPSDIR)/$*.d $(CFLAGS) $(INCLUDE_FULL) -c $< -o $@ $(ERROR_FILTER) + @$(CC) -MMD -MP -MF $(DEPSDIR)/$*.d $(CFLAGS) $(INCLUDE_FULL) -c $< -o $@ $(ERROR_FILTER) #--------------------------------------------------------------------------------- %.o: %.S diff --git a/ide_templates/codeblocks/makefile.mk b/ide_templates/codeblocks/makefile.mk index a352000..c1d5cfd 100644 --- a/ide_templates/codeblocks/makefile.mk +++ b/ide_templates/codeblocks/makefile.mk @@ -14,12 +14,18 @@ DATA := INCLUDES := src #--------------------------------------------------------------------------------- -# options for code generation +# options for code generation and linking #--------------------------------------------------------------------------------- # Extra C compiler flags CFLAGS := # Extra C++ compiler flags CXXFLAGS := +# Extra linking flags for all linking steps +LD_FLAGS := +# extra linking flags for linking the temporarily elf file (using ld) +LD_FLAGS_ELF := +# extra linking flags for linking the final mod file (using gcc/g++) +LD_FLAGS_MOD := #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing @@ -43,5 +49,4 @@ EXTERNAL_LIBPATHS := # Will be added to the final include paths # -IC:/library1/include #--------------------------------------------------------------------------------- -EXTERNAL_INCLUDE := -I$(PORTLIBS)/include/libutils \ - -I$(WUPSDIR)/include +EXTERNAL_INCLUDE := -I$(PORTLIBS)/include/libutils diff --git a/plugins/example_plugin/Makefile b/plugins/example_plugin/Makefile index 67f1bad..09c3f4b 100644 --- a/plugins/example_plugin/Makefile +++ b/plugins/example_plugin/Makefile @@ -82,8 +82,8 @@ endif ASFLAGS += LDFLAG_COMMON += -LDFLAGS_MOD += -LDFLAGS_ELF += +LDFLAGS_MOD += $(LD_FLAGS_MOD) +LDFLAGS_ELF += $(LD_FLAGS_ELF) #--------------------------------------------------------------------------------- Q := @ @@ -181,7 +181,7 @@ all : $(OUTPUT) # Rule to make the module file. $(OUTPUT) : output.elf @echo "checking for missing symbols ..." - @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAG_COMMON) $(ALL_LIBS) $(LIBPATHS_FULL) -o check_linking.elf + @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAG_COMMON) $(LD_FLAGS_MOD) $(ALL_LIBS) $(LIBPATHS_FULL) -o check_linking.elf @echo "linking ..." $@ @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAGS_MOD) $(ALL_LIBS) $(LIBPATHS_FULL) -o $@ diff --git a/plugins/example_plugin/makefile.mk b/plugins/example_plugin/makefile.mk index a352000..c1d5cfd 100644 --- a/plugins/example_plugin/makefile.mk +++ b/plugins/example_plugin/makefile.mk @@ -14,12 +14,18 @@ DATA := INCLUDES := src #--------------------------------------------------------------------------------- -# options for code generation +# options for code generation and linking #--------------------------------------------------------------------------------- # Extra C compiler flags CFLAGS := # Extra C++ compiler flags CXXFLAGS := +# Extra linking flags for all linking steps +LD_FLAGS := +# extra linking flags for linking the temporarily elf file (using ld) +LD_FLAGS_ELF := +# extra linking flags for linking the final mod file (using gcc/g++) +LD_FLAGS_MOD := #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing @@ -43,5 +49,4 @@ EXTERNAL_LIBPATHS := # Will be added to the final include paths # -IC:/library1/include #--------------------------------------------------------------------------------- -EXTERNAL_INCLUDE := -I$(PORTLIBS)/include/libutils \ - -I$(WUPSDIR)/include +EXTERNAL_INCLUDE := -I$(PORTLIBS)/include/libutils diff --git a/plugins/hid_to_vpad/Makefile b/plugins/hid_to_vpad/Makefile index 67f1bad..09c3f4b 100644 --- a/plugins/hid_to_vpad/Makefile +++ b/plugins/hid_to_vpad/Makefile @@ -82,8 +82,8 @@ endif ASFLAGS += LDFLAG_COMMON += -LDFLAGS_MOD += -LDFLAGS_ELF += +LDFLAGS_MOD += $(LD_FLAGS_MOD) +LDFLAGS_ELF += $(LD_FLAGS_ELF) #--------------------------------------------------------------------------------- Q := @ @@ -181,7 +181,7 @@ all : $(OUTPUT) # Rule to make the module file. $(OUTPUT) : output.elf @echo "checking for missing symbols ..." - @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAG_COMMON) $(ALL_LIBS) $(LIBPATHS_FULL) -o check_linking.elf + @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAG_COMMON) $(LD_FLAGS_MOD) $(ALL_LIBS) $(LIBPATHS_FULL) -o check_linking.elf @echo "linking ..." $@ @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAGS_MOD) $(ALL_LIBS) $(LIBPATHS_FULL) -o $@ diff --git a/plugins/hid_to_vpad/makefile.mk b/plugins/hid_to_vpad/makefile.mk index 461fffc..83c15fc 100644 --- a/plugins/hid_to_vpad/makefile.mk +++ b/plugins/hid_to_vpad/makefile.mk @@ -14,12 +14,18 @@ DATA := INCLUDES := src #--------------------------------------------------------------------------------- -# options for code generation +# options for code generation and linking #--------------------------------------------------------------------------------- # Extra C compiler flags CFLAGS := # Extra C++ compiler flags CXXFLAGS := +# Extra linking flags for all linking steps +LD_FLAGS := +# extra linking flags for linking the temporarily elf file (using ld) +LD_FLAGS_ELF := +# extra linking flags for linking the final mod file (using gcc/g++) +LD_FLAGS_MOD := #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing @@ -43,5 +49,4 @@ EXTERNAL_LIBPATHS := # Will be added to the final include paths # -IC:/library1/include #--------------------------------------------------------------------------------- -EXTERNAL_INCLUDE := -I$(PORTLIBS)/include/libutils \ - -I$(WUPSDIR)/include +EXTERNAL_INCLUDE := -I$(PORTLIBS)/include/libutils diff --git a/plugins/memory_info/Makefile b/plugins/memory_info/Makefile index 67f1bad..09c3f4b 100644 --- a/plugins/memory_info/Makefile +++ b/plugins/memory_info/Makefile @@ -82,8 +82,8 @@ endif ASFLAGS += LDFLAG_COMMON += -LDFLAGS_MOD += -LDFLAGS_ELF += +LDFLAGS_MOD += $(LD_FLAGS_MOD) +LDFLAGS_ELF += $(LD_FLAGS_ELF) #--------------------------------------------------------------------------------- Q := @ @@ -181,7 +181,7 @@ all : $(OUTPUT) # Rule to make the module file. $(OUTPUT) : output.elf @echo "checking for missing symbols ..." - @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAG_COMMON) $(ALL_LIBS) $(LIBPATHS_FULL) -o check_linking.elf + @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAG_COMMON) $(LD_FLAGS_MOD) $(ALL_LIBS) $(LIBPATHS_FULL) -o check_linking.elf @echo "linking ..." $@ @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAGS_MOD) $(ALL_LIBS) $(LIBPATHS_FULL) -o $@ diff --git a/plugins/memory_info/makefile.mk b/plugins/memory_info/makefile.mk index a352000..c1d5cfd 100644 --- a/plugins/memory_info/makefile.mk +++ b/plugins/memory_info/makefile.mk @@ -14,12 +14,18 @@ DATA := INCLUDES := src #--------------------------------------------------------------------------------- -# options for code generation +# options for code generation and linking #--------------------------------------------------------------------------------- # Extra C compiler flags CFLAGS := # Extra C++ compiler flags CXXFLAGS := +# Extra linking flags for all linking steps +LD_FLAGS := +# extra linking flags for linking the temporarily elf file (using ld) +LD_FLAGS_ELF := +# extra linking flags for linking the final mod file (using gcc/g++) +LD_FLAGS_MOD := #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing @@ -43,5 +49,4 @@ EXTERNAL_LIBPATHS := # Will be added to the final include paths # -IC:/library1/include #--------------------------------------------------------------------------------- -EXTERNAL_INCLUDE := -I$(PORTLIBS)/include/libutils \ - -I$(WUPSDIR)/include +EXTERNAL_INCLUDE := -I$(PORTLIBS)/include/libutils diff --git a/plugins/nnu_patcher/Makefile b/plugins/nnu_patcher/Makefile index 67f1bad..09c3f4b 100644 --- a/plugins/nnu_patcher/Makefile +++ b/plugins/nnu_patcher/Makefile @@ -82,8 +82,8 @@ endif ASFLAGS += LDFLAG_COMMON += -LDFLAGS_MOD += -LDFLAGS_ELF += +LDFLAGS_MOD += $(LD_FLAGS_MOD) +LDFLAGS_ELF += $(LD_FLAGS_ELF) #--------------------------------------------------------------------------------- Q := @ @@ -181,7 +181,7 @@ all : $(OUTPUT) # Rule to make the module file. $(OUTPUT) : output.elf @echo "checking for missing symbols ..." - @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAG_COMMON) $(ALL_LIBS) $(LIBPATHS_FULL) -o check_linking.elf + @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAG_COMMON) $(LD_FLAGS_MOD) $(ALL_LIBS) $(LIBPATHS_FULL) -o check_linking.elf @echo "linking ..." $@ @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAGS_MOD) $(ALL_LIBS) $(LIBPATHS_FULL) -o $@ diff --git a/plugins/nnu_patcher/makefile.mk b/plugins/nnu_patcher/makefile.mk index a352000..c1d5cfd 100644 --- a/plugins/nnu_patcher/makefile.mk +++ b/plugins/nnu_patcher/makefile.mk @@ -14,12 +14,18 @@ DATA := INCLUDES := src #--------------------------------------------------------------------------------- -# options for code generation +# options for code generation and linking #--------------------------------------------------------------------------------- # Extra C compiler flags CFLAGS := # Extra C++ compiler flags CXXFLAGS := +# Extra linking flags for all linking steps +LD_FLAGS := +# extra linking flags for linking the temporarily elf file (using ld) +LD_FLAGS_ELF := +# extra linking flags for linking the final mod file (using gcc/g++) +LD_FLAGS_MOD := #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing @@ -43,5 +49,4 @@ EXTERNAL_LIBPATHS := # Will be added to the final include paths # -IC:/library1/include #--------------------------------------------------------------------------------- -EXTERNAL_INCLUDE := -I$(PORTLIBS)/include/libutils \ - -I$(WUPSDIR)/include +EXTERNAL_INCLUDE := -I$(PORTLIBS)/include/libutils diff --git a/plugins/overlay/Makefile b/plugins/overlay/Makefile index 67f1bad..09c3f4b 100644 --- a/plugins/overlay/Makefile +++ b/plugins/overlay/Makefile @@ -82,8 +82,8 @@ endif ASFLAGS += LDFLAG_COMMON += -LDFLAGS_MOD += -LDFLAGS_ELF += +LDFLAGS_MOD += $(LD_FLAGS_MOD) +LDFLAGS_ELF += $(LD_FLAGS_ELF) #--------------------------------------------------------------------------------- Q := @ @@ -181,7 +181,7 @@ all : $(OUTPUT) # Rule to make the module file. $(OUTPUT) : output.elf @echo "checking for missing symbols ..." - @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAG_COMMON) $(ALL_LIBS) $(LIBPATHS_FULL) -o check_linking.elf + @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAG_COMMON) $(LD_FLAGS_MOD) $(ALL_LIBS) $(LIBPATHS_FULL) -o check_linking.elf @echo "linking ..." $@ @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAGS_MOD) $(ALL_LIBS) $(LIBPATHS_FULL) -o $@ diff --git a/plugins/overlay/makefile.mk b/plugins/overlay/makefile.mk index a352000..c1d5cfd 100644 --- a/plugins/overlay/makefile.mk +++ b/plugins/overlay/makefile.mk @@ -14,12 +14,18 @@ DATA := INCLUDES := src #--------------------------------------------------------------------------------- -# options for code generation +# options for code generation and linking #--------------------------------------------------------------------------------- # Extra C compiler flags CFLAGS := # Extra C++ compiler flags CXXFLAGS := +# Extra linking flags for all linking steps +LD_FLAGS := +# extra linking flags for linking the temporarily elf file (using ld) +LD_FLAGS_ELF := +# extra linking flags for linking the final mod file (using gcc/g++) +LD_FLAGS_MOD := #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing @@ -43,5 +49,4 @@ EXTERNAL_LIBPATHS := # Will be added to the final include paths # -IC:/library1/include #--------------------------------------------------------------------------------- -EXTERNAL_INCLUDE := -I$(PORTLIBS)/include/libutils \ - -I$(WUPSDIR)/include +EXTERNAL_INCLUDE := -I$(PORTLIBS)/include/libutils diff --git a/plugins/padcon/Makefile b/plugins/padcon/Makefile index 67f1bad..09c3f4b 100644 --- a/plugins/padcon/Makefile +++ b/plugins/padcon/Makefile @@ -82,8 +82,8 @@ endif ASFLAGS += LDFLAG_COMMON += -LDFLAGS_MOD += -LDFLAGS_ELF += +LDFLAGS_MOD += $(LD_FLAGS_MOD) +LDFLAGS_ELF += $(LD_FLAGS_ELF) #--------------------------------------------------------------------------------- Q := @ @@ -181,7 +181,7 @@ all : $(OUTPUT) # Rule to make the module file. $(OUTPUT) : output.elf @echo "checking for missing symbols ..." - @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAG_COMMON) $(ALL_LIBS) $(LIBPATHS_FULL) -o check_linking.elf + @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAG_COMMON) $(LD_FLAGS_MOD) $(ALL_LIBS) $(LIBPATHS_FULL) -o check_linking.elf @echo "linking ..." $@ @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAGS_MOD) $(ALL_LIBS) $(LIBPATHS_FULL) -o $@ diff --git a/plugins/padcon/makefile.mk b/plugins/padcon/makefile.mk index a352000..2c2ee84 100644 --- a/plugins/padcon/makefile.mk +++ b/plugins/padcon/makefile.mk @@ -14,12 +14,19 @@ DATA := INCLUDES := src #--------------------------------------------------------------------------------- -# options for code generation +# options for code generation and linking #--------------------------------------------------------------------------------- # Extra C compiler flags CFLAGS := # Extra C++ compiler flags CXXFLAGS := +# Extra linking flags for all linking steps +LD_FLAGS := +# extra linking flags for linking the temporarily elf file (using ld) +LD_FLAGS_ELF := +# extra linking flags for linking the final mod file (using gcc/g++) +LD_FLAGS_MOD := + #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing @@ -43,5 +50,4 @@ EXTERNAL_LIBPATHS := # Will be added to the final include paths # -IC:/library1/include #--------------------------------------------------------------------------------- -EXTERNAL_INCLUDE := -I$(PORTLIBS)/include/libutils \ - -I$(WUPSDIR)/include +EXTERNAL_INCLUDE := -I$(PORTLIBS)/include/libutils diff --git a/plugins/screenshot/Makefile b/plugins/screenshot/Makefile index 67f1bad..09c3f4b 100644 --- a/plugins/screenshot/Makefile +++ b/plugins/screenshot/Makefile @@ -82,8 +82,8 @@ endif ASFLAGS += LDFLAG_COMMON += -LDFLAGS_MOD += -LDFLAGS_ELF += +LDFLAGS_MOD += $(LD_FLAGS_MOD) +LDFLAGS_ELF += $(LD_FLAGS_ELF) #--------------------------------------------------------------------------------- Q := @ @@ -181,7 +181,7 @@ all : $(OUTPUT) # Rule to make the module file. $(OUTPUT) : output.elf @echo "checking for missing symbols ..." - @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAG_COMMON) $(ALL_LIBS) $(LIBPATHS_FULL) -o check_linking.elf + @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAG_COMMON) $(LD_FLAGS_MOD) $(ALL_LIBS) $(LIBPATHS_FULL) -o check_linking.elf @echo "linking ..." $@ @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAGS_MOD) $(ALL_LIBS) $(LIBPATHS_FULL) -o $@ diff --git a/plugins/screenshot/makefile.mk b/plugins/screenshot/makefile.mk index 8f6de7f..d681650 100644 --- a/plugins/screenshot/makefile.mk +++ b/plugins/screenshot/makefile.mk @@ -14,12 +14,18 @@ DATA := INCLUDES := src #--------------------------------------------------------------------------------- -# options for code generation +# options for code generation and linking #--------------------------------------------------------------------------------- # Extra C compiler flags CFLAGS := # Extra C++ compiler flags CXXFLAGS := +# Extra linking flags for all linking steps +LD_FLAGS := +# extra linking flags for linking the temporarily elf file (using ld) +LD_FLAGS_ELF := +# extra linking flags for linking the final mod file (using gcc/g++) +LD_FLAGS_MOD := #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing @@ -43,5 +49,4 @@ EXTERNAL_LIBPATHS := # Will be added to the final include paths # -IC:/library1/include #--------------------------------------------------------------------------------- -EXTERNAL_INCLUDE := -I$(PORTLIBS)/include/libutils \ - -I$(WUPSDIR)/include +EXTERNAL_INCLUDE := -I$(PORTLIBS)/include/libutils \ No newline at end of file diff --git a/plugins/sdcafiine/Makefile b/plugins/sdcafiine/Makefile index 67f1bad..09c3f4b 100644 --- a/plugins/sdcafiine/Makefile +++ b/plugins/sdcafiine/Makefile @@ -82,8 +82,8 @@ endif ASFLAGS += LDFLAG_COMMON += -LDFLAGS_MOD += -LDFLAGS_ELF += +LDFLAGS_MOD += $(LD_FLAGS_MOD) +LDFLAGS_ELF += $(LD_FLAGS_ELF) #--------------------------------------------------------------------------------- Q := @ @@ -181,7 +181,7 @@ all : $(OUTPUT) # Rule to make the module file. $(OUTPUT) : output.elf @echo "checking for missing symbols ..." - @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAG_COMMON) $(ALL_LIBS) $(LIBPATHS_FULL) -o check_linking.elf + @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAG_COMMON) $(LD_FLAGS_MOD) $(ALL_LIBS) $(LIBPATHS_FULL) -o check_linking.elf @echo "linking ..." $@ @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAGS_MOD) $(ALL_LIBS) $(LIBPATHS_FULL) -o $@ diff --git a/plugins/sdcafiine/makefile.mk b/plugins/sdcafiine/makefile.mk index c18a86e..e7648c7 100644 --- a/plugins/sdcafiine/makefile.mk +++ b/plugins/sdcafiine/makefile.mk @@ -7,7 +7,7 @@ TARGET := $(notdir $(CURDIR)).mod # Source directories SOURCES := src \ src/common \ - src/myfs \ + src/myfs # Data directories DATA := @@ -16,12 +16,18 @@ DATA := INCLUDES := src #--------------------------------------------------------------------------------- -# options for code generation +# options for code generation and linking #--------------------------------------------------------------------------------- # Extra C compiler flags CFLAGS := # Extra C++ compiler flags CXXFLAGS := -D_GNU_SOURCE +# Extra linking flags for all linking steps +LD_FLAGS := +# extra linking flags for linking the temporarily elf file (using ld) +LD_FLAGS_ELF := +# extra linking flags for linking the final mod file (using gcc/g++) +LD_FLAGS_MOD := #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing @@ -46,5 +52,4 @@ EXTERNAL_LIBPATHS := # -IC:/library1/include #--------------------------------------------------------------------------------- EXTERNAL_INCLUDE := -I$(PORTLIBS)/include/libutils \ - -I$(PORTLIBS)/include/libfswrapper \ - -I$(WUPSDIR)/include + -I$(PORTLIBS)/include/libfswrapper \ No newline at end of file diff --git a/plugins/swipswapme/Makefile b/plugins/swipswapme/Makefile index 67f1bad..09c3f4b 100644 --- a/plugins/swipswapme/Makefile +++ b/plugins/swipswapme/Makefile @@ -82,8 +82,8 @@ endif ASFLAGS += LDFLAG_COMMON += -LDFLAGS_MOD += -LDFLAGS_ELF += +LDFLAGS_MOD += $(LD_FLAGS_MOD) +LDFLAGS_ELF += $(LD_FLAGS_ELF) #--------------------------------------------------------------------------------- Q := @ @@ -181,7 +181,7 @@ all : $(OUTPUT) # Rule to make the module file. $(OUTPUT) : output.elf @echo "checking for missing symbols ..." - @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAG_COMMON) $(ALL_LIBS) $(LIBPATHS_FULL) -o check_linking.elf + @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAG_COMMON) $(LD_FLAGS_MOD) $(ALL_LIBS) $(LIBPATHS_FULL) -o check_linking.elf @echo "linking ..." $@ @$(LD_MOD) ../$(BUILD)/output.elf $(LDFLAGS_MOD) $(ALL_LIBS) $(LIBPATHS_FULL) -o $@ diff --git a/plugins/swipswapme/makefile.mk b/plugins/swipswapme/makefile.mk index 8039515..1908f69 100644 --- a/plugins/swipswapme/makefile.mk +++ b/plugins/swipswapme/makefile.mk @@ -16,12 +16,18 @@ DATA := INCLUDES := src #--------------------------------------------------------------------------------- -# options for code generation +# options for code generation and linking #--------------------------------------------------------------------------------- # Extra C compiler flags CFLAGS := # Extra C++ compiler flags CXXFLAGS := +# Extra linking flags for all linking steps +LD_FLAGS := +# extra linking flags for linking the temporarily elf file (using ld) +LD_FLAGS_ELF := +# extra linking flags for linking the final mod file (using gcc/g++) +LD_FLAGS_MOD := #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing @@ -45,5 +51,4 @@ EXTERNAL_LIBPATHS := # Will be added to the final include paths # -IC:/library1/include #--------------------------------------------------------------------------------- -EXTERNAL_INCLUDE := -I$(PORTLIBS)/include/libutils \ - -I$(WUPSDIR)/include +EXTERNAL_INCLUDE := -I$(PORTLIBS)/include/libutils