diff options
author | Daniel Stenberg <daniel@haxx.se> | 2005-03-06 15:53:44 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2005-03-06 15:53:44 +0000 |
commit | 0bf50f02cc79c70529abe829a0d42f76591bce20 (patch) | |
tree | f86aac0f293c145afd91f50f7b5a61ac1e9044bc | |
parent | f9b36e34a73c5cf616ca8603dc236f0fcaf15b5b (diff) | |
download | rockbox-0bf50f02cc79c70529abe829a0d42f76591bce20.tar.gz rockbox-0bf50f02cc79c70529abe829a0d42f76591bce20.zip |
adjusted to use the new Make include file to create the SRC variable from
the SOURCES file
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6155 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | uisimulator/common/Makefile | 5 | ||||
-rw-r--r-- | uisimulator/win32/Makefile | 5 | ||||
-rw-r--r-- | uisimulator/x11/Makefile | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/uisimulator/common/Makefile b/uisimulator/common/Makefile index e2b6b2a4f8..62a124ac97 100644 --- a/uisimulator/common/Makefile +++ b/uisimulator/common/Makefile | |||
@@ -25,8 +25,9 @@ DEBUG = -g | |||
25 | # Use this for simulator-only files | 25 | # Use this for simulator-only files |
26 | INCLUDES = -I. -I$(OBJDIR) -I$(FIRMDIR)/export -I$(APPSDIR) -I$(ROOTDIR)/uisimulator/$(SIMVER) | 26 | INCLUDES = -I. -I$(OBJDIR) -I$(FIRMDIR)/export -I$(APPSDIR) -I$(ROOTDIR)/uisimulator/$(SIMVER) |
27 | 27 | ||
28 | SRC := $(shell cat SOURCES | gcc -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) \ | 28 | # This sets up 'SRC' based on the files mentioned in SOURCES |
29 | $(TARGET) $(DEFINES) $(EXTRA_DEFINES) -E -P -include "config.h" - ) | 29 | include $(TOOLSDIR)/makesrc.inc |
30 | |||
30 | OBJS := $(SRC:%.c=$(OBJDIR)/%.o) | 31 | OBJS := $(SRC:%.c=$(OBJDIR)/%.o) |
31 | 32 | ||
32 | DEFINES := -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ | 33 | DEFINES := -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ |
diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile index f429cad8b5..f04a54bdd4 100644 --- a/uisimulator/win32/Makefile +++ b/uisimulator/win32/Makefile | |||
@@ -29,8 +29,9 @@ INCLUDES = -I. -I$(SIMCOMMON) -I$(OBJDIR) -I$(FIRMDIR)/export -I$(APPSDIR) | |||
29 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ | 29 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ |
30 | $(TARGET) -DAPPSVERSION=\"$(VERSION)\" -DMEM=${MEMORYSIZE} $(EXTRA_DEFINES) | 30 | $(TARGET) -DAPPSVERSION=\"$(VERSION)\" -DMEM=${MEMORYSIZE} $(EXTRA_DEFINES) |
31 | 31 | ||
32 | SRC := $(shell cat SOURCES | gcc -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) \ | 32 | # This sets up 'SRC' based on the files mentioned in SOURCES |
33 | $(TARGET) $(DEFINES) $(EXTRA_DEFINES) -E -P -include "config.h" - ) | 33 | include $(TOOLSDIR)/makesrc.inc |
34 | |||
34 | OBJS := $(SRC:%.c=$(OBJDIR)/%.o) | 35 | OBJS := $(SRC:%.c=$(OBJDIR)/%.o) |
35 | 36 | ||
36 | SOURCES = $(SRC) | 37 | SOURCES = $(SRC) |
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index 0c0c31183d..f032c664be 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile | |||
@@ -27,8 +27,9 @@ DEBUG = -g | |||
27 | # Use this for simulator-only files | 27 | # Use this for simulator-only files |
28 | INCLUDES = -I. -I$(SIMCOMMON) -I$(OBJDIR) -I$(FIRMDIR)/export -I$(APPSDIR) | 28 | INCLUDES = -I. -I$(SIMCOMMON) -I$(OBJDIR) -I$(FIRMDIR)/export -I$(APPSDIR) |
29 | 29 | ||
30 | SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) \ | 30 | # This sets up 'SRC' based on the files mentioned in SOURCES |
31 | $(TARGET) $(DEFINES) $(EXTRA_DEFINES) -E -P -include "config.h" - ) | 31 | include $(TOOLSDIR)/makesrc.inc |
32 | |||
32 | OBJS := $(SRC:%.c=$(OBJDIR)/%.o) | 33 | OBJS := $(SRC:%.c=$(OBJDIR)/%.o) |
33 | 34 | ||
34 | DEFINES := -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ | 35 | DEFINES := -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ |