diff options
author | Daniel Stenberg <daniel@haxx.se> | 2005-05-07 22:41:17 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2005-05-07 22:41:17 +0000 |
commit | b8a23f9e4980e6a041d750c325ab2845aea8488a (patch) | |
tree | d10400e99208595638f13e7fe3b279274a173e56 /apps/plugins/searchengine | |
parent | d23afcd4f4ad72b1c2c087055a9ba4457f2646cd (diff) | |
download | rockbox-b8a23f9e4980e6a041d750c325ab2845aea8488a.tar.gz rockbox-b8a23f9e4980e6a041d750c325ab2845aea8488a.zip |
Fixed makefiles for autoconf.g include.
Fixed build output look in several Makefiles
Fixed code to include autoconf.h
Fixed code to use ROCKBOX_*_ENDIAN instead of previous attempts.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6421 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/searchengine')
-rw-r--r-- | apps/plugins/searchengine/Makefile | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/apps/plugins/searchengine/Makefile b/apps/plugins/searchengine/Makefile index e6e980b7b0..e59bd8fbde 100644 --- a/apps/plugins/searchengine/Makefile +++ b/apps/plugins/searchengine/Makefile | |||
@@ -7,8 +7,8 @@ | |||
7 | # $Id$ | 7 | # $Id$ |
8 | # | 8 | # |
9 | 9 | ||
10 | INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | 10 | INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ |
11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) | 11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) -I$(BUILDDIR) |
12 | CFLAGS = $(GCCOPTS) -O3 $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | 12 | CFLAGS = $(GCCOPTS) -O3 $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ |
13 | -DMEM=${MEMORYSIZE} -DPLUGIN | 13 | -DMEM=${MEMORYSIZE} -DPLUGIN |
14 | 14 | ||
@@ -30,13 +30,13 @@ OUTPUT = $(OUTDIR)/searchengine.rock | |||
30 | all: $(OUTPUT) | 30 | all: $(OUTPUT) |
31 | 31 | ||
32 | ifndef SIMVER | 32 | ifndef SIMVER |
33 | $(OBJDIR)/searchengine.elf: $(OBJS) $(LINKFILE) $(OUTDIR)/libplugin.a | 33 | $(OBJDIR)/searchengine.elf: $(OBJS) $(LINKFILE) |
34 | @echo "LD $@" | 34 | @echo "LD "`basename $@` |
35 | @$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(OUTDIR) -lplugin -lgcc \ | 35 | @$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ |
36 | -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/searchengine.map | 36 | -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/searchengine.map |
37 | 37 | ||
38 | $(OUTPUT): $(OBJDIR)/searchengine.elf | 38 | $(OUTPUT): $(OBJDIR)/searchengine.elf |
39 | @echo "OBJCOPY $<" | 39 | @echo "OBJCOPY "`basename $@` |
40 | @$(OC) -O binary $< $@ | 40 | @$(OC) -O binary $< $@ |
41 | else | 41 | else |
42 | 42 | ||
@@ -44,9 +44,9 @@ ifeq ($(SIMVER), x11) | |||
44 | ################################################### | 44 | ################################################### |
45 | # This is the X11 simulator version | 45 | # This is the X11 simulator version |
46 | 46 | ||
47 | $(OUTPUT): $(OBJS) $(OUTDIR)/libplugin.a | 47 | $(OUTPUT): $(OBJS) |
48 | @echo "LD $@" | 48 | @echo "LD $<" |
49 | @$(CC) $(CFLAGS) -shared $(OBJS) -L$(OUTDIR) -lplugin -o $@ | 49 | @$(CC) $(CFLAGS) -shared $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
50 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 50 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
51 | # 'x' must be kept or you'll have "Win32 error 5" | 51 | # 'x' must be kept or you'll have "Win32 error 5" |
52 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 52 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -61,11 +61,11 @@ else # end of x11-simulator | |||
61 | DLLTOOLFLAGS = --export-all | 61 | DLLTOOLFLAGS = --export-all |
62 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin | 62 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin |
63 | 63 | ||
64 | $(OUTPUT): $(OBJS) $(OUTDIR)/libplugin.a | 64 | $(OUTPUT): $(OBJS) |
65 | @echo "DLL $@" | 65 | @echo "DLL $@" |
66 | @$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS) | 66 | @$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS) |
67 | @$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \ | 67 | @$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \ |
68 | $(OUTDIR)/libplugin.a -o $@ | 68 | $(BUILDDIR)/libplugin.a -o $@ |
69 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 69 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
70 | # 'x' must be kept or you'll have "Win32 error 5" | 70 | # 'x' must be kept or you'll have "Win32 error 5" |
71 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 71 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -80,12 +80,12 @@ endif # end of simulator section | |||
80 | 80 | ||
81 | include $(TOOLSDIR)/make.inc | 81 | include $(TOOLSDIR)/make.inc |
82 | 82 | ||
83 | # MEM should be passed on to this makefile with the chosen memory size given | 83 | # MEMORYSIZE should be passed on to this makefile with the chosen memory size |
84 | # in number of MB | 84 | # given in number of MB |
85 | $(LINKFILE): $(LDS) | 85 | $(LINKFILE): $(LDS) |
86 | @echo "build $@" | 86 | @echo "build "`basename $@` |
87 | @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) \ | 87 | @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \ |
88 | -E -P - >$@ | 88 | $(DEFINES) -E -P - >$@ |
89 | 89 | ||
90 | clean: | 90 | clean: |
91 | @echo "cleaning searchengine" | 91 | @echo "cleaning searchengine" |