diff --git a/Application.mk b/Application.mk index 92b61a09d..fa033c027 100644 --- a/Application.mk +++ b/Application.mk @@ -84,10 +84,10 @@ endif # Module install directory ifeq ($(WINTOOL),y) - BIN = "${shell cygpath -w $(APPDIR)$(DELIM)libapps$(LIBEXT)}" + BIN ?= "${shell cygpath -w $(APPDIR)$(DELIM)libapps$(LIBEXT)}" INSTALL_DIR = "${shell cygpath -w $(BINDIR)}" else - BIN = $(APPDIR)$(DELIM)libapps$(LIBEXT) + BIN ?= $(APPDIR)$(DELIM)libapps$(LIBEXT) INSTALL_DIR = $(BINDIR) endif @@ -99,7 +99,7 @@ VPATH += :. all:: .built .PHONY: clean preconfig depend distclean -.PRECIOUS: $(APPDIR)/libapps$(LIBEXT) +.PRECIOUS: $(BIN) ifneq ($(CONFIG_BUILD_LOADABLE),y) diff --git a/Make.defs b/Make.defs index ebb5b5ed5..3d5c2a792 100644 --- a/Make.defs +++ b/Make.defs @@ -51,7 +51,7 @@ define REGISTER endef else define REGISTER - $(Q) echo "Register: $1 $4" + $(Q) echo "Register: $1" $(Q) echo "{ \"$1\", $2, $3, $4 }," > "$(BUILTIN_REGISTRY)$(DELIM)$1.bdat" $(Q) if [ ! -z $4 ]; then \ echo "int $4(int argc, char *argv[]);" > "$(BUILTIN_REGISTRY)$(DELIM)$1.pdat"; \ @@ -113,5 +113,5 @@ CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(APPDIR)$(DELIM)include"} CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(APPDIR)$(DELIM)include"} ifneq ($(CONFIG_BUILD_KERNEL),y) - LDLIBS = $(APPDIR)/libapps.a + LDLIBS ?= $(APPDIR)/libapps.a endif diff --git a/Makefile b/Makefile index 4852575fb..acbf290b9 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,7 @@ BINDIR = $(APPDIR)$(DELIM)bin # The final build target -BIN = libapps$(LIBEXT) +BIN ?= libapps$(LIBEXT) # Symbol table for loadable apps. @@ -81,7 +81,7 @@ SYMTABOBJ = $(SYMTABSRC:.c=$(OBJEXT)) all: $(BIN) .PHONY: import install dirlinks context context_serialize clean_context context_rest export .depdirs preconfig depend clean distclean -.PRECIOUS: libapps$(LIBEXT) +.PRECIOUS: $(BIN) define MAKE_template $(Q) cd $(1) && $(MAKE) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BINDIR="$(BINDIR)"