Changeset 1594 for trunk/core/modules/Makefile

Timestamp:

01/21/12 20:45:50 (16 months ago)

Author:

philmoz

Message:

Some cleanup of the main trunk by moving all the game related files to a separate directory.
Also fixes a problem in the curves code introduced when it was converted to a module.

File:

• trunk/core/modules/Makefile (modified) (4 diffs)

trunk/core/modules/Makefile

@@ -17 +17 @@
 LDOPTS+=-Wl,-N,-Ttext,0x0016ee30 -r -Wl,-d
 
-OBJS=../gui_calendar.o ../gui_bench.o ../gui_4wins.o ../gui_mastermind.o ../gui_reversi.o \
-         ../gui_sokoban.o ../gui_read.o ../gui_debug.o  ../gui_tetris.o ../gui_snake.o ../gui_games.o ../dng.o ../gps.o
+OBJS=../gui_calendar.o ../gui_bench.o ../gui_read.o ../gui_debug.o ../dng.o ../gps.o \
+     ../gui_fselect.o ../nothumb.o ../gui_mpopup.o ../curves.o ../edgeoverlay.o \
+     ../bitvector.o ../gui_palette.o ../gui_grid.o ../motion_detector.o ../zebra.o \
+     ../games/gui_4wins.o ../games/gui_mastermind.o ../games/gui_reversi.o \
+         ../games/gui_sokoban.o  ../games/gui_tetris.o ../games/gui_snake.o ../games/gui_games.o ../games/simple_game.o
+
+FLTS=fselect.flt edgeovr.flt curves.flt mpopup.flt palette.flt grids.flt mdetect.flt zebra.flt \
+     _dng.flt benchm.flt calend.flt 4wins.flt mastmind.flt reversi.flt sokoban.flt _rawop10.flt _rawop12.flt \
+     txtread.flt memview.flt modinsp.flt tetris.flt snake.flt gamemenu.flt modmenu.flt _tbox.flt
 
 
-CFLAGS+=-DOPT_GENERIC_MODULES
-OPT_OBJS= ../gui_fselect.o ../nothumb.o ../gui_mpopup.o ../curves.o ../edgeoverlay.o ../bitvector.o ../gui_palette.o ../gui_grid.o ../motion_detector.o ../zebra.o
-OPT_FLT= fselect.flt edgeovr.flt curves.flt mpopup.flt palette.flt grids.flt mdetect.flt zebra.flt
-
-
-all: exportlist ../flt.h \
-                _dng.flt benchm.flt calend.flt 4wins.flt mastmind.flt reversi.flt sokoban.flt _rawop10.flt _rawop12.flt \
-                txtread.flt memview.flt modinsp.flt tetris.flt snake.flt gamemenu.flt modmenu.flt _tbox.flt $(OPT_FLT)
+all: exportlist ../flt.h $(FLTS)
 
 %.o: %.c
@@ -42 +42 @@
         @echo \-\> $@
 #       arm-elf-objdump.exe -d -r -x $< >$<.dumpobj
-#       $(topdir)/tools/elf2flt/elf2flt$(EXE) $< $@ -e -f -h -r -s -iexportlist.txt >$@.dump
+#       $(topdir)/tools/elf2flt/elf2flt$(EXE) $< $@ -e -f -h -r -s -iexportlist.txt -!$(topdir)/tools/elf2flt/stoplist.txt >$@.dump
         $(topdir)/tools/elf2flt/elf2flt$(EXE) $< $@ -iexportlist.txt -!$(topdir)/tools/elf2flt/stoplist.txt > $(DEVNULL)
 
@@ -57 +57 @@
         $(CC) $(CFLAGS) -o $@ -Wl,--start-group $^ $(LDLIBS) -Wl,--end-group $(LDFLAGS) $(LDOPTS)
 
-4wins.elf: simple_game.o ../gui_4wins.o
+4wins.elf: ../games/simple_game.o ../games/gui_4wins.o
         @echo \-\> $@
         $(CC) $(CFLAGS) -o $@ -Wl,--start-group $^ $(LDLIBS) -Wl,--end-group $(LDFLAGS) $(LDOPTS)
 
-mastmind.elf: simple_game.o ../gui_mastermind.o
+mastmind.elf: ../games/simple_game.o ../games/gui_mastermind.o
         @echo \-\> $@
         $(CC) $(CFLAGS) -o $@ -Wl,--start-group $^ $(LDLIBS) -Wl,--end-group $(LDFLAGS) $(LDOPTS)
 
-reversi.elf: simple_game.o ../gui_reversi.o
+reversi.elf: ../games/simple_game.o ../games/gui_reversi.o
         @echo \-\> $@
         $(CC) $(CFLAGS) -o $@ -Wl,--start-group $^ $(LDLIBS) -Wl,--end-group $(LDFLAGS) $(LDOPTS)
 
-tetris.elf: simple_game.o ../gui_tetris.o
+tetris.elf: ../games/simple_game.o ../games/gui_tetris.o
         @echo \-\> $@
         $(CC) $(CFLAGS) -o $@ -Wl,--start-group $^ $(LDLIBS) -Wl,--end-group $(LDFLAGS) $(LDOPTS)
 
-snake.elf: simple_game.o ../gui_snake.o
+snake.elf: ../games/simple_game.o ../games/gui_snake.o
         @echo \-\> $@
         $(CC) $(CFLAGS) -o $@ -Wl,--start-group $^ $(LDLIBS) -Wl,--end-group $(LDFLAGS) $(LDOPTS)
 
-sokoban.elf: ../gui_sokoban.o
+sokoban.elf: ../games/gui_sokoban.o
         @echo \-\> $@
         $(CC) $(CFLAGS) -o $@ -Wl,--start-group $^ $(LDLIBS) -Wl,--end-group $(LDFLAGS) $(LDOPTS)
 
-gamemenu.elf: ../gui_games.o
+gamemenu.elf: ../games/gui_games.o
         @echo \-\> $@
         $(CC) $(CFLAGS) -o $@ -Wl,--start-group $^ $(LDLIBS) -Wl,--end-group $(LDFLAGS) $(LDOPTS)
@@ -162 +162 @@
 
 clean:
-        rm -f *.o *.elf.syms *.elf *.flt $(OBJS) $(OPT_OBJS)
+        rm -f *.o *.elf.syms *.elf *.flt $(OBJS)
 
 distclean: clean