Changeset 1366


Ignore:
Timestamp:
10/15/11 08:19:39 (20 months ago)
Author:
philmoz
Message:

Update for the CHDK makefiles - part 1.
The goal is to simplify the batch build process and remove the current (complex) method of defining which cameras/firmware versions are in the autobuild.
Split into parts in case anything breaks the autobuild server.

Location:
trunk
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile

    r1361 r1366  
    99 
    1010SUBDIRS=tools lib platform core loader CHDK 
    11  
    12 all: all-recursive 
    13  
    14 clean: clean-recursive 
    15  
    16 distclean: distclean-recursive 
    1711 
    1812fir: version firsub 
    … …  
    3125  ifeq ($(PLATFORMOS),vxworks) 
    3226        @echo \-\> PS.FIR 
    33         $(PAKWIF) $(topdir)bin/PS.FIR \ 
    34               $(topdir)bin/main.bin\ 
    35             $(PLATFORMID) 0x01000101 
     27        $(PAKWIF) $(topdir)bin/PS.FIR $(topdir)bin/main.bin $(PLATFORMID) 0x01000101 
    3628  endif 
    3729  ifeq ($(PLATFORMOS),dryos) 
    … …  
    5547        @echo "**** Firmware creation completed successfully" 
    5648 
     49.PHONY: upload 
    5750upload: fir 
    5851        @echo Uploading... 
    … …  
    6356        @echo "**** GCC $(GCC_VERSION) : BUILDING CHDK-$(VER), #$(BUILD_NUMBER) FOR $(PLATFORM)-$(PLATFORMSUB)" 
    6457 
     58.PHONY: version 
    6559version: FORCE 
    6660        echo "**** Build: $(BUILD_NUMBER)" 
    67 #       echo "BUILD_NUMBER := $(BUILD_NUMBER)" > version.inc 
    68  
     61 
     62.PHONY: FORCE 
    6963FORCE: 
    7064 

  • trunk/bottom.inc

    r515 r1366  
    44#-include $(OBJS:%.o=.dep/%.d) 
    55#endif 
     6 
     7 
     8# Define empty recipes for source files (including the makefiles) 
     9# to prevent make from trying implicit rules to create them. Speeds up build process 
     10$(topdir)bottom.inc: ; 

  • trunk/makefile.inc

    r1353 r1366  
    433433 
    434434ifdef OPT_FI2 
    435 include $(topdir)/platform/fi2.inc 
     435include $(topdir)platform/fi2.inc 
    436436endif 
    437437 
    … …  
    595595########################################################################## 
    596596 
     597.PHONY: default 
    597598default: all 
    598599 
    … …  
    621622endif 
    622623 
     624.PHONY: all 
    623625all: all-recursive 
     626 
     627.PHONY: clean 
    624628clean: clean-recursive 
     629 
     630.PHONY: distclean 
    625631distclean: distclean-recursive 
    626632 
    … …  
    657663.SILENT: 
    658664endif 
     665 
     666 
     667# Define empty recipes for source files (including the makefiles) 
     668# to prevent make from trying implicit rules to create them. Speeds up build process 
     669Makefile: ; 
     670makefile: ; 
     671$(topdir)makefile.inc: ; 
     672$(topdir)buildconf.inc: ; 
     673$(topdir)localbuildconf.inc: ; 
     674$(topdir)version.inc: ; 
     675$(topdir)platform/$(PLATFORM)/sub/$(PLATFORMSUB)/makefile.inc: ; 
     676$(topdir)platform/fi2.inc: ; 
     677*.c: ; 
     678*.txt: ; 
     679*.sh: ; 
     680reversebytes.S: ; 
     681callfunc.S: ; 
     682setjmp.S: ; 
     683stubs_min.S: ; 
     684stubs_entry_2.S: ; 

  • trunk/platform/a2000/sub/100c/Makefile

    r797 r1366  
    44STUBS_AUTO_DEPS=boot.c capt_seq.c movie_rec.c 
    55 
    6 include $(topdir)/platform/makefile_sub.inc 
     6include $(topdir)platform/makefile_sub.inc 

  • trunk/platform/d10/sub/100a/Makefile

    r897 r1366  
    33STUBS_AUTO_DEPS=boot.c capt_seq.c movie_rec.c 
    44 
    5 include $(topdir)/platform/makefile_sub.inc 
     5include $(topdir)platform/makefile_sub.inc 
    66 

  • trunk/platform/ixus100_sd780/sub/100b/Makefile

    r1328 r1366  
    44STUBS_AUTO_DEPS=boot.c capt_seq.c movie_rec.c 
    55 
    6 include $(topdir)/platform/makefile_sub.inc 
     6include $(topdir)platform/makefile_sub.inc 
    77 
    88# debugging 

  • trunk/platform/ixus100_sd780/sub/100c/Makefile

    r1173 r1366  
    44STUBS_AUTO_DEPS=boot.c capt_seq.c movie_rec.c 
    55 
    6 include $(topdir)/platform/makefile_sub.inc 
     6include $(topdir)platform/makefile_sub.inc 
    77 
    88# debugging 

  • trunk/platform/ixus120_sd940/sub/102c/Makefile

    r1056 r1366  
    44STUBS_AUTO_DEPS=boot.c capt_seq.c movie_rec.c 
    55 
    6 include $(topdir)/platform/makefile_sub.inc 
     6include $(topdir)platform/makefile_sub.inc 
    77 
    88# debugging 

  • trunk/platform/ixus900_sd900/sub/100c/Makefile

    r959 r1366  
    99//STUBS_AUTO_DEPS=boot.c capt_seq.c movie_rec.c mount.c debug.c 
    1010 
    11 include $(topdir)/platform/makefile_sub.inc 
     11include $(topdir)platform/makefile_sub.inc 

  • trunk/platform/ixus90_sd790/sub/100c/Makefile

    r870 r1366  
    44STUBS_AUTO_DEPS=boot.c capt_seq.c movie_rec.c 
    55 
    6 include $(topdir)/platform/makefile_sub.inc 
     6include $(topdir)platform/makefile_sub.inc 

  • trunk/platform/ixus90_sd790/sub/100d/Makefile

    r866 r1366  
    44STUBS_AUTO_DEPS=boot.c capt_seq.c movie_rec.c 
    55 
    6 include $(topdir)/platform/makefile_sub.inc 
     6include $(topdir)platform/makefile_sub.inc 

  • trunk/platform/ixus95_sd1200/sub/100c/Makefile

    r910 r1366  
    44STUBS_AUTO_DEPS=boot.c capt_seq.c movie_rec.c 
    55 
    6 include $(topdir)/platform/makefile_sub.inc 
     6include $(topdir)platform/makefile_sub.inc 
    77 
    88# debugging 

  • trunk/platform/ixus980_sd990/sub/100e/Makefile

    r740 r1366  
    44STUBS_AUTO_DEPS=boot.c capt_seq.c movie_rec.c 
    55 
    6 include $(topdir)/platform/makefile_sub.inc 
     6include $(topdir)platform/makefile_sub.inc 
    77 
    88# debugging 

  • trunk/platform/ixus980_sd990/sub/101b/Makefile

    r792 r1366  
    44STUBS_AUTO_DEPS=boot.c capt_seq.c movie_rec.c 
    55 
    6 include $(topdir)/platform/makefile_sub.inc 
     6include $(topdir)platform/makefile_sub.inc 
    77 
    88# debugging 

  • trunk/platform/makefile_sub.inc

    r1291 r1366  
    7373 
    7474include $(topdir)bottom.inc 
     75 
     76 
     77# Define empty recipes for source files (including the makefiles) 
     78# to prevent make from trying implicit rules to create them. Speeds up build process 
     79$(topdir)platform/makefile_sub.inc: ; 

  • trunk/platform/sx110is/sub/100b/Makefile

    r749 r1366  
    44STUBS_AUTO_DEPS=boot.c capt_seq.c movie_rec.c 
    55 
    6 include $(topdir)/platform/makefile_sub.inc 
     6include $(topdir)platform/makefile_sub.inc 
Note: See TracChangeset for help on using the changeset viewer.