From b8a23f9e4980e6a041d750c325ab2845aea8488a Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 7 May 2005 22:41:17 +0000 Subject: 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 --- apps/codecs/libFLAC/Makefile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'apps/codecs/libFLAC') diff --git a/apps/codecs/libFLAC/Makefile b/apps/codecs/libFLAC/Makefile index 1c8b0682a7..9da55ba0e2 100644 --- a/apps/codecs/libFLAC/Makefile +++ b/apps/codecs/libFLAC/Makefile @@ -7,8 +7,9 @@ # $Id$ # -INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ - -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(APPSDIR)/codecs/libFLAC/include +INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ + -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(APPSDIR)/codecs/libFLAC/include \ + -I$(BUILDDIR) ifdef APPEXTRA INCLUDES += -I$(APPSDIR)/$(APPEXTRA) @@ -16,9 +17,10 @@ endif NEWGCC=$(shell expr $(GCCNUM) ">" 303) -FLACOPTS = -DFLAC__NO_ASM -DFLAC__ALIGN_MALLOC_DATA \ --DFLAC__INTEGER_ONLY_LIBRARY -DVERSION=\"1.1.2\" -fomit-frame-pointer \ --funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__ +FLACOPTS = -DFLAC__NO_ASM -DFLAC__ALIGN_MALLOC_DATA \ +-DFLAC__INTEGER_ONLY_LIBRARY -DVERSION=\"1.1.2\" -fomit-frame-pointer \ +-funroll-loops -finline-functions -Wall -W -Wno-inline \ +-DFLaC__INLINE=__inline__ ifeq ($(NEWGCC), 1) # this is 3.4.X options: @@ -37,7 +39,7 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) DEPFILE = $(OBJDIR)/dep-libFLAC DIRS = -OUTPUT = $(OBJDIR)/libFLAC.a +OUTPUT = $(BUILDDIR)/libFLAC.a all: $(OUTPUT) @@ -47,7 +49,7 @@ $(OUTPUT): $(OBJS) $(OBJDIR)/libFLAC/%.o: $(APPSDIR)/codecs/libFLAC/%.c @mkdir -p $(OBJDIR)/libFLAC - @echo "CC $<" + @echo "(libFLAC) CC $<" @$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/libFLAC/include/FLAC $< -o $@ include $(TOOLSDIR)/make.inc -- cgit v1.2.3