Changeset 1481 for branches/reyalp-flt/Makefile

Timestamp:

12/12/11 17:19:43 (18 months ago)

Author:

tsv

Message:

• Added MODULES dir
• Fix for GCC4.6.2 (from whim)
• Changing root Makefile to keep compiled modules in CHDK/MODULES (from philmoz )

File:

• branches/reyalp-flt/Makefile (modified) (4 diffs)

branches/reyalp-flt/Makefile

@@ -42 +42 @@
         mv  $(topdir)bin/main.bin  $(topdir)bin/DISKBOOT.BIN
 endif
+        rm -f $(topdir)CHDK/MODULES/*
+        cp $(topdir)core/modules/*.flt $(topdir)CHDK/MODULES
         @echo "**** Firmware creation completed successfully"
 
@@ -81 +83 @@
       endif
     endif
-        rm -f $(topdir)CHDK/MODULES/*
-        cp $(topdir)core/modules/*.flt $(topdir)CHDK/MODULES
         zip -9 $(topdir)bin/$(VER)-$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip $(topdir)CHDK/MODULES/*
         # if COPY_TO is defined then copy this camera/firmware version to the copied firmware version
@@ -96 +96 @@
     endif
         rm -f $(topdir)bin/DISKBOOT.BIN
-        rm -f $(topdir)CHDK/MODULES/*
-        rm -f $(topdir)core/modules/*.flt
 
 
@@ -133 +131 @@
         zip -9j $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)doc/readme.txt  > $(DEVNULL)
         zip -9j $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip $(topdir)doc/readme.txt  > $(DEVNULL)
-        rm -f $(topdir)CHDK/MODULES/*
-        cp $(topdir)core/modules/*.flt $(topdir)CHDK/MODULES
         zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/MODULES/*  > $(DEVNULL)
         zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip $(topdir)CHDK/MODULES/*  > $(DEVNULL)
-        rm -f $(topdir)CHDK/MODULES/*
-        rm -f $(topdir)core/modules/*.flt
 
     ifdef PLATFORMOS