diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-09-26 20:51:23 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-09-26 20:51:23 +0000 |
commit | c7c657ca9264b1bc7dc313a92e285128fc9ffea3 (patch) | |
tree | f88968ce38fb14c7f458d5f1d1cfff23e93d4a22 /rbutil/mktccboot | |
parent | ccc5f4c4e1687cd7cf515f26da0f5ab918090736 (diff) | |
download | rockbox-c7c657ca9264b1bc7dc313a92e285128fc9ffea3.tar.gz rockbox-c7c657ca9264b1bc7dc313a92e285128fc9ffea3.zip |
Prevent unnecessary rebuilding of libs.
- When building for Rockbox Utility the called Makefiles would rebuild the libs
every time. Change dependencies a bit to allow make to properly detect if the
lib is already up to date.
- Remove dependency on output folder in some cases to avoid unnecessary
rebuilds.
- Add standard Rockbox header to files lacking it.
- Make make calls from qmake silent.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30608 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/mktccboot')
-rw-r--r-- | rbutil/mktccboot/Makefile | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/rbutil/mktccboot/Makefile b/rbutil/mktccboot/Makefile index 7a7acf87b7..b01f25dc3d 100644 --- a/rbutil/mktccboot/Makefile +++ b/rbutil/mktccboot/Makefile @@ -34,29 +34,34 @@ ifdef RBARCH CFLAGS += -arch $(RBARCH) endif -OUT = $(TARGET_DIR)build$(RBARCH) +TARGET_DIR ?= $(shell pwd)/ +OBJDIR = $(TARGET_DIR)build$(RBARCH) all: $(OUTPUT) # inputs LIBSOURCES := mktccboot.c $(TOOLSDIR)/telechips.o SOURCES := $(LIBSOURCES) main.c -OBJS := $(patsubst %.c,%.o,$(addprefix $(OUT)/,$(notdir $(SOURCES)))) -LIBOBJS := $(patsubst %.c,%.o,$(addprefix $(OUT)/,$(notdir $(LIBSOURCES)))) +OBJS := $(patsubst %.c,%.o,$(addprefix $(OBJDIR)/,$(notdir $(SOURCES)))) +LIBOBJS := $(patsubst %.c,%.o,$(addprefix $(OBJDIR)/,$(notdir $(LIBSOURCES)))) EXTRADEPS := # rule for sources from tools dir -$(OUT)/%.o: $(TOOLSDIR)/%.c $(OUT) +$(OBJDIR)/%.o: $(TOOLSDIR)/%.c @echo CC $< + $(SILENT)mkdir -p $(dir $@) $(SILENT)$(CC) $(CFLAGS) -c -o $@ $< -$(OUT)/%.o: %.c $(OUT) +$(OBJDIR)/%.o: %.c @echo CC $< + $(SILENT)mkdir -p $(dir $@) $(SILENT)$(CC) $(CFLAGS) -c -o $@ $< -libmktccboot$(RBARCH).a: $(LIBOBJS) - @echo AR $@ - $(SILENT)$(AR) rucs $(TARGET_DIR)$@ $^ +libmktccboot$(RBARCH).a: $(TARGET_DIR)libmktccboot$(RBARCH).a + +$(TARGET_DIR)libmktccboot$(RBARCH).a: $(LIBOBJS) + @echo AR $(notdir $@) + $(SILENT)$(AR) rucs $@ $^ # building the standalone executable $(OUTPUT): $(OBJS) $(EXTRADEPS) @@ -70,16 +75,16 @@ $(TARGET_DIR)libmktccbooti386.a: $(TARGET_DIR)libmktccbootppc.a: make RBARCH=ppc TARGET_DIR=$(TARGET_DIR) libmktccbootppc.a -endif - +endif + libmktccboot-universal: $(TARGET_DIR)libmktccbooti386.a $(TARGET_DIR)libmktccbootppc.a @echo lipo $(TARGET_DIR)libmktccboot.a $(SILENT) rm -f $(TARGET_DIR)libmktccboot.a $(SILENT)lipo -create $(TARGET_DIR)libmktccbootppc.a $(TARGET_DIR)libmktccbooti386.a -output $(TARGET_DIR)libmktccboot.a - + clean: rm -f $(OUTPUT) $(TARGET_DIR)libmktccboot*.a mktccboot.dmg - rm -rf $(OUT) + rm -rf $(OBJDIR) mktccboot-i386: $(MAKE) RBARCH=i386 @@ -96,8 +101,5 @@ mktccboot.dmg: mktccboot-mac mkdir -p mktccboot-dmg cp -p mktccboot-mac mktccboot-dmg hdiutil create -srcfolder mktccboot-dmg mktccboot.dmg - -$(OUT): - @echo MKDIR $(OUT) - $(SILENT)mkdir $(OUT) + |