Unified build system to use SOURCES for sim builds too, a single Makefile-look

made by configure and various related adjustments. This has not yet been tested
on cygwin.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6001 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 32 insertions, 230 deletions

diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile
index 7b86ee2f5b..68815fe8d8 100644
--- a/uisimulator/x11/Makefile
+++ b/uisimulator/x11/Makefile
@@ -17,252 +17,44 @@
 #
 ############################################################################
 
-RECDIR = $(APPSDIR)/recorder
-PLAYDIR = $(APPSDIR)/player
-PLUGINDIR = $(APPSDIR)/plugins
 SIMCOMMON = ../common
 
-ISONDIO := $(findstring ONDIO, $(TARGET))
-ISIRIVER := $(findstring IRIVER, $(TARGET))
-ISPLAYER := $(findstring PLAYER, $(TARGET))
-ifeq ($(ISPLAYER), PLAYER)
-     MACHINEDIR = $(PLAYDIR)
-else
-     MACHINEDIR = $(RECDIR)
-endif
-
-PREVAPPSDIR= ..
-
-# build some sources from these dirs
-DRIVERS = $(FIRMDIR)/drivers
-COMMON = $(FIRMDIR)/common
-
-# include here:
-EXPORT = $(FIRMDIR)/export
+DEPFILE = $(OBJDIR)/dep-sim
 
 RM = rm -f
 DEBUG = -g
 
-ifndef OBJDIR
-no_configure:
-        @echo "Don't run make here. Run the tools/configure script from your own build"
-        @echo "directory, then run make there."
-        @echo
-        @echo "More help on how to build rockbox can be found here:"
-        @echo "http://rockbox.haxx.se/docs/how_to_compile.html"
-endif
-
-DEFINES := -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \
-$(TARGET) -DAPPSVERSION=\"$(VERSION)\" -DMEM=${MEMORYSIZE} $(EXTRA_DEFINES) 
-
 # Use this for simulator-only files
-INCLUDES = -I. -I$(EXPORT) -I$(APPSDIR) -I$(MACHINEDIR) -I$(SIMCOMMON) -I$(OBJDIR) -I$(PLUGINDIR)/lib
-
-# The true Rockbox Applications should use this include path:
-APPINCLUDES =  $(INCLUDES)
-
-SRCDIRS = . $(DRIVERS) $(FIRMDIR)/export $(APPSDIR) $(MACHINEDIR)
-
-# The true Rockbox Applications should use this include path:
-APPINCLUDES = $(INCLUDES)
-
-LIBS = -lpthread
+INCLUDES = -I. -I$(SIMCOMMON) -I$(OBJDIR) -I$(FIRMDIR)/export -I$(APPSDIR)
 
-CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall
+SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) \
+ $(TARGET) $(DEFINES) $(EXTRA_DEFINES) -E -P -include "config.h" - )
+OBJS := $(SRC:%.c=$(OBJDIR)/%.o)
 
-APPCFLAGS = $(DEBUG) $(DEFINES) $(APPINCLUDES) -W -Wall
-
-UNAME := $(shell uname|sed -e "s/CYGWIN.*/CYGWIN/")
-EXEFILE = $(OBJDIR)/rockboxui
-ifeq ($(UNAME),Linux)
-  LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl -ldl
-  INCLUDES += -I/usr/X11R6/include
-  LIBDIRS = -L/usr/X11R6/lib
-  DEFINES += -DHAVE_OSS
-else
-ifeq ($(UNAME),CYGWIN)
-  LDFLAGS = -lSM -lICE -lXt -lX11 -lXmu -lSM -lICE -lX11
-  INCLUDES += -I/usr/X11R6/include
-  LIBDIRS = -L/usr/X11R6/lib
-  DEFINES += -DHAVE_OSS -D_SSIZE_T_
-  EXEFILE = $(OBJDIR)/rockboxui.exe
-else
-ifeq ($(UNAME),FreeBSD)
-  LIBS = -pthread
-  LDFLAGS = -lX11 -lm -lXt -lXmu
-  INCLUDES += -I/usr/X11R6/include
-  LIBDIRS = -L/usr/X11R6/lib
-  DEFINES += -DHAVE_OSS
-else
-  LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl -ldl
-  DEFINES += -DBIG_ENDIAN
-  LIBDIRS = 
-endif
-endif
-endif
-
-ifeq ($(HAVE_MPEG_PLAY),1)
-        SOUNDSRC = mpegplay.c oss_sound.c
-        LDFLAGS += $(SOUND_LDFLAGS)
-        CFLAGS += $(SOUND_CFLAGS) -DHAVE_MPEG_PLAY
-else
-        SOUNDSRC = 
-endif
-
-ifeq ($(ISPLAYER), PLAYER)
-        LCDSRSC = lcd-playersim.c lcd-player.c lcd-player-charset.c font-player.c
-else
-ifeq ($(ISIRIVER),IRIVER)
-        LCDSRSC = lcd-h100.c sysfont.c font.c
-else
-        LCDSRSC = lcd-recorder.c sysfont.c font.c
-endif
-endif
-COMMONSRCS = io.c stubs.c lcd-common.c sim_icons.c fmradio.c
-
-FIRMSRCS = $(LCDSRSC) id3.c mp3data.c usb.c mpeg.c mp3_playback.c \
-        powermgmt.c power.c sprintf.c buffer.c strtok.c random.c \
-        timefuncs.c panic.c debug.c strcasestr.c
-
-APPS = main.c tree.c menu.c credits.c main_menu.c icons.c language.c \
-        playlist.c wps.c wps-display.c settings.c status.c \
-        screens.c sleeptimer.c keyboard.c onplay.c\
-        misc.c plugin.c playlist_viewer.c bookmark.c filetypes.c \
-        settings_menu.c sound_menu.c playlist_menu.c filetree.c dbtree.c
-
-ifneq ($(ISPLAYER), PLAYER)
-   APPS += peakmeter.c bmp.c widgets.c radio.c
-endif
+DEFINES := -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \
+$(TARGET) -DAPPSVERSION=\"$(VERSION)\" -DMEM=${MEMORYSIZE} $(EXTRA_DEFINES) 
 
-SRCS = screenhack.c uibasic.c resources.c visual.c lcd-x11.c \
-       button-x11.c thread.c $(APPS) $(MENUS) $(FIRMSRCS) \
-       $(COMMONSRCS) $(SOUNDSRC)
+SOURCES = $(SRC)
 
-OBJS := $(OBJDIR)/lang.o $(SRCS:%.c=$(OBJDIR)/%.o)
+DIRS = .
 
-ifdef ENABLEDPLUGINS
-  ROCKS := $(patsubst $(PLUGINDIR)/%.c,$(OBJDIR)/%.rock,$(wildcard $(PLUGINDIR)/*.c))
-  PLUGINLIBOBJS := $(patsubst $(PLUGINDIR)/lib/%.c,$(OBJDIR)/%.o,$(wildcard $(PLUGINDIR)/lib/*.c))
-endif
+CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) $(GCCOPTS)
 
-all: $(TOOLSDIR)/convbdf $(EXEFILE) $(ROCKS)
+OUTFILE = $(OBJDIR)/libsim.a
 
-$(ROCKS): $(OBJDIR)/libplugin.a
+all: $(OUTFILE)
+        @echo "MAKE in common sim"
+        $(MAKE) -C $(SIMCOMMON)
 
-$(TOOLSDIR)/convbdf:
-        $(MAKE) -C $(TOOLSDIR)
+include $(TOOLSDIR)/make.inc
 
 clean:
-        $(RM) $(OBJS) *~ core $(EXEFILE) $(CLIENTS) $(OBJDIR)/lang.[cho] \
-        $(OBJDIR)/build.lang $(OBJDIR)/*.o $(OBJDIR)/sysfont.c \
-        $(ROCKS) $(OBJDIR)/credits.raw
-        $(RM) -r $(DEPS)
-        $(RM) -f $(OBJDIR)/libplugin.a $(OBJDIR)/rockbox.zip
-
-################## Specific dependencies ##################
-$(OBJDIR)/credits.raw: $(DOCSDIR)/CREDITS
-        perl $(APPSDIR)/credits.pl < $< > $@
-
-$(OBJDIR)/uisw32-res.o: uisw32.rc
-        $(WINDRES) -i $< -o $@
-
-$(OBJDIR)/credits.o: $(APPSDIR)/credits.c $(APPSDIR)/credits.h $(OBJDIR)/credits.raw
-
-$(OBJDIR)/thread.o: ./thread.c
-$(OBJDIR)/plugin.o: $(APPSDIR)/plugin.c
-$(OBJDIR)/build.lang: $(APPSDIR)/lang/$(LANGUAGE).lang
-        @echo "UPLANG"
-        @perl $(TOOLSDIR)/uplang $(APPSDIR)/lang/english.lang $< > $@
-
-$(OBJDIR)/lang.o: $(OBJDIR)/build.lang
-        @echo GENLANG
-        @perl -s $(TOOLSDIR)/genlang -p=$(OBJDIR)/lang $<
-        @echo "CC lang.c"
-        $(CC) $(CFLAGS) -c $(OBJDIR)/lang.c -o $@
-
-$(OBJDIR)/sysfont.o: $(FIRMDIR)/fonts/clR6x8.bdf
-        @echo CC $<
-        @$(TOOLSDIR)/convbdf -c -o $(OBJDIR)/sysfont.c $<
-        @$(CC) $(APPCFLAGS) -c $(OBJDIR)/sysfont.c -o $@
-
-################## Plugins ##################
-$(OBJDIR)/libplugin.a:  $(PLUGINLIBOBJS)
-        @echo AR $<
-        @$(AR) ru $@ $+
-
-$(OBJDIR)/%.o: $(PLUGINDIR)/lib/%.c
-        @echo CC $<
-        @$(CC) $(CFLAGS) -DPLUGIN -c $< -o $@
-
-$(OBJDIR)/%.rock: $(APPSDIR)/plugins/%.c $(APPSDIR)/plugin.h
-        @echo CC $<
-        @$(CC) $(APPCFLAGS) -DPLUGIN -shared $< -L$(OBJDIR) -lplugin -o $@
-ifeq ($(UNAME),CYGWIN)
-# 'x' must be kept or you'll have "Win32 error 5" 
-#     $ fgrep 5 /usr/include/w32api/winerror.h | head -1
-#         #define ERROR_ACCESS_DENIED 5L
-else
-        @chmod -x $@
-endif
-
-################## Patterns for building objects ##################
-$(OBJDIR)/%.o: ../x11/%.c
-        @echo CC $<
-        @$(CC) $(CFLAGS) -c $< -o $@
-
-$(OBJDIR)/%.o: $(SIMCOMMON)/%.c
-        @echo CC $<
-        @$(CC) $(APPCFLAGS) -c $< -o $@
-
-$(OBJDIR)/%.o: $(MACHINEDIR)/%.c
-        @echo CC $<
-        @$(CC) $(APPCFLAGS) -c $< -o $@
-
-$(OBJDIR)/%.o: $(DRIVERS)/%.c
-        @echo CC $<
-        @$(CC) $(APPCFLAGS) -c $< -o $@
-
-$(OBJDIR)/%.o: $(FIRMDIR)/%.c
-        @echo CC $<
-        @$(CC) $(APPCFLAGS) -c $< -o $@
-
-$(OBJDIR)/%.o: $(COMMON)/%.c
-        @echo CC $<
-        @$(CC) $(APPCFLAGS) -c $< -o $@
-
-$(OBJDIR)/%.o: $(APPSDIR)/%.c
-        @echo CC $<
-        @$(CC) $(APPCFLAGS) -c $< -o $@
-
-
-################## Auto-dependencies ##################
-DEPS:=$(OBJDIR)/.deps
-
-$(DEPS)/%.d: %.c
-                @$(SHELL) -c 'if [ ! -d $(DEPS) ]; then \
-                        echo Creating the dependency directory: $(DEPS); \
-                        mkdir -p $(DEPS); fi'
-                @$(SHELL) -ec '$(CC) -MM $(CFLAGS) $< \
-        |sed '\''s|\($*\)\.o[ :]*|$(OBJDIR)/\1.o $(<:%.c=%.d) : |g'\'' > $@; \
-        [ -s $@ ] || rm -f $@'
-
--include $(SRCS:%.c=$(DEPS)/%.d)
-
-# these ones are simulator-specific
-
-$(OBJDIR)/%.o: %.c
-        $(CC) $(CFLAGS) -c $< -o $@
-
-ifeq ($(UNAME),CYGWIN)
-$(EXEFILE): $(OBJS)
-        @echo LD $@
-        @$(CC) -g -o $(EXEFILE) $(OBJS) $(LIBDIRS) $(LDFLAGS) $(LIBS)
-else
-$(EXEFILE): $(OBJS)
-        @echo LD $@
-        @$(CC) -g -o $(EXEFILE) $(LIBDIRS) $(LDFLAGS) $(OBJS) $(LIBS)
-endif
+        @echo "cleaning sim"
+        @$(RM) $(OBJS) *~ core $(OUTFILE) $(DEPFILE)
+        @$(MAKE) -C $(SIMCOMMON) clean
 
-tags:
-        @$(SHELL) -c 'for d in $(SRCDIRS); do { etags -o $(OBJDIR)/TAGS -a $$d/*.[ch]; }; done'
+$(OUTFILE): $(OBJS)
+        @echo "AR $@"
+        @$(AR) ruv $@ $(OBJS) >/dev/null 2>&1
 
+-include $(DEPFILE)
diff --git a/uisimulator/x11/SOURCES b/uisimulator/x11/SOURCES
new file mode 100644
index 0000000000..ea60b4e68a
--- /dev/null
+++ b/uisimulator/x11/SOURCES
@@ -0,0 +1,10 @@
+button-x11.c
+lcd-x11.c
+#if 0 /* if sound is enabled */
+oss_sound.c
+#endif
+resources.c
+screenhack.c
+thread.c
+uibasic.c
+visual.c