X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Flib.mk;h=b4e2d02a5fb0aa07cab082b397b464ec38e04492;hb=52fab8ba7e2a728e884a06fa80f9e0a0d4938e05;hp=c49b7cccae690bde96f2843891c50cbfaa2fa135;hpb=6948a474f661628751910aeff3bd3a96eb07010d;p=platform%2Fupstream%2Fflac.git

diff --git a/build/lib.mk b/build/lib.mk
index c49b7cc..b4e2d02 100644
--- a/build/lib.mk
+++ b/build/lib.mk
@@ -1,5 +1,5 @@
 #  FLAC - Free Lossless Audio Codec
-#  Copyright (C) 2001,2002,2003,2004,2005,2006 Josh Coalson
+#  Copyright (C) 2001,2002,2003,2004,2005,2006,2007,2008,2009  Josh Coalson
 #
 #  This file is part the FLAC project.  FLAC is comprised of several
 #  components distributed under difference licenses.  The codec libraries
@@ -21,26 +21,29 @@
 
 include $(topdir)/build/config.mk
 
-ifeq ($(DARWIN_BUILD),yes)
-CC          = cc
-CCC         = c++
+ifeq ($(OS),Darwin)
+    CC          = cc
+    CCC         = c++
 else
-CC          = gcc
-CCC         = g++
+    CC          = gcc
+    CCC         = g++
 endif
 AS          = as
 NASM        = nasm
 LINK        = ar cru
-OBJPATH     = $(topdir)/obj
+OBJPATH     = $(topdir)/objs
 LIBPATH     = $(OBJPATH)/$(BUILD)/lib
 DEBUG_LIBPATH     = $(OBJPATH)/debug/lib
 RELEASE_LIBPATH   = $(OBJPATH)/release/lib
-ifeq ($(DARWIN_BUILD),yes)
-STATIC_LIB_SUFFIX = a
-DYNAMIC_LIB_SUFFIX = dylib
+ifeq ($(OS),Darwin)
+    STATIC_LIB_SUFFIX = a
+    DYNAMIC_LIB_SUFFIX = dylib
+else ifeq ($(findstring MINGW,$(OS)),MINGW)
+    STATIC_LIB_SUFFIX = a
+    DYNAMIC_LIB_SUFFIX = dll
 else
-STATIC_LIB_SUFFIX = a
-DYNAMIC_LIB_SUFFIX = so
+    STATIC_LIB_SUFFIX = a
+    DYNAMIC_LIB_SUFFIX = so
 endif
 STATIC_LIB_NAME     = $(LIB_NAME).$(STATIC_LIB_SUFFIX)
 DYNAMIC_LIB_NAME    = $(LIB_NAME).$(DYNAMIC_LIB_SUFFIX)
@@ -50,20 +53,24 @@ DEBUG_STATIC_LIB    = $(DEBUG_LIBPATH)/$(STATIC_LIB_NAME)
 DEBUG_DYNAMIC_LIB   = $(DEBUG_LIBPATH)/$(DYNAMIC_LIB_NAME)
 RELEASE_STATIC_LIB  = $(RELEASE_LIBPATH)/$(STATIC_LIB_NAME)
 RELEASE_DYNAMIC_LIB = $(RELEASE_LIBPATH)/$(DYNAMIC_LIB_NAME)
-ifeq ($(DARWIN_BUILD),yes)
-LINKD       = $(CC) -dynamiclib -flat_namespace -undefined suppress -install_name $(DYNAMIC_LIB)
+ifeq ($(OS),Darwin)
+    LINKD       = $(CC) -dynamiclib -flat_namespace -undefined suppress -install_name $(DYNAMIC_LIB)
 else
-LINKD       = $(CC) -shared
+    LINKD       = $(CC) -shared
 endif
 
-debug   : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -W -Wall -Wextra -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
-valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -W -Wall -Wextra -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
-release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -W -Wall -Wextra -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
+debug   : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -W -Wall -Wmissing-prototypes -Wstrict-prototypes -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
+valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -W -Wall -Wmissing-prototypes -Wstrict-prototypes -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
+release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
 
 LFLAGS  = -L$(LIBPATH)
 
 DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o) $(SRCS_S:%.s=%.debug.o)
 RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o) $(SRCS_S:%.s=%.release.o)
+ifeq ($(PROC),x86_64)
+DEBUG_PIC_OBJS = $(SRCS_C:%.c=%.debug.pic.o) $(SRCS_CC:%.cc=%.debug.pic.o) $(SRCS_CPP:%.cpp=%.debug.pic.o) $(SRCS_NASM:%.nasm=%.debug.pic.o) $(SRCS_S:%.s=%.debug.pic.o)
+RELEASE_PIC_OBJS = $(SRCS_C:%.c=%.release.pic.o) $(SRCS_CC:%.cc=%.release.pic.o) $(SRCS_CPP:%.cpp=%.release.pic.o) $(SRCS_NASM:%.nasm=%.release.pic.o) $(SRCS_S:%.s=%.release.pic.o)
+endif
 
 debug   : $(DEBUG_STATIC_LIB) $(DEBUG_DYNAMIC_LIB)
 valgrind: $(DEBUG_STATIC_LIB) $(DEBUG_DYNAMIC_LIB)
@@ -75,47 +82,33 @@ $(DEBUG_STATIC_LIB): $(DEBUG_OBJS)
 $(RELEASE_STATIC_LIB): $(RELEASE_OBJS)
 	$(LINK) $@ $(RELEASE_OBJS) && ranlib $@
 
-$(DEBUG_DYNAMIC_LIB) : $(DEBUG_OBJS)
-ifeq ($(DARWIN_BUILD),yes)
+$(DEBUG_DYNAMIC_LIB) : $(DEBUG_OBJS) $(DEBUG_PIC_OBJS)
+ifeq ($(OS),Darwin)
 	echo Not building dynamic lib, command is: $(LINKD) -o $@ $(DEBUG_OBJS) $(LFLAGS) $(LIBS) -lc
 else
+ifeq ($(PROC),x86_64)
+	$(LINKD) -o $@ $(DEBUG_PIC_OBJS) $(LFLAGS) $(LIBS)
+else
 	$(LINKD) -o $@ $(DEBUG_OBJS) $(LFLAGS) $(LIBS)
 endif
+endif
 
-$(RELEASE_DYNAMIC_LIB) : $(RELEASE_OBJS)
-ifeq ($(DARWIN_BUILD),yes)
+$(RELEASE_DYNAMIC_LIB) : $(RELEASE_OBJS) $(RELEASE_PIC_OBJS)
+ifeq ($(OS),Darwin)
 	echo Not building dynamic lib, command is: $(LINKD) -o $@ $(RELEASE_OBJS) $(LFLAGS) $(LIBS) -lc
 else
+ifeq ($(PROC),x86_64)
+	$(LINKD) -o $@ $(RELEASE_PIC_OBJS) $(LFLAGS) $(LIBS)
+else
 	$(LINKD) -o $@ $(RELEASE_OBJS) $(LFLAGS) $(LIBS)
 endif
-
-%.debug.o %.release.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-%.debug.o %.release.o : %.cc
-	$(CCC) $(CFLAGS) -c $< -o $@
-%.debug.o %.release.o : %.cpp
-	$(CCC) $(CFLAGS) -c $< -o $@
-%.debug.i %.release.i : %.c
-	$(CC) $(CFLAGS) -E $< -o $@
-%.debug.i %.release.i : %.cc
-	$(CCC) $(CFLAGS) -E $< -o $@
-%.debug.i %.release.i : %.cpp
-	$(CCC) $(CFLAGS) -E $< -o $@
-
-%.debug.o %.release.o : %.s
-ifeq ($(DARWIN_BUILD),yes)
-	#$(CC) -c -arch ppc -Wall -force_cpusubtype_ALL $< -o $@
-	$(AS) -arch ppc -force_cpusubtype_ALL $< -o $@
-else
-	$(AS) $< -o $@
 endif
 
-%.debug.o %.release.o : %.nasm
-	$(NASM) -f elf -d OBJ_FORMAT_elf -i ia32/ $< -o $@
+include $(topdir)/build/compile.mk
 
 .PHONY : clean
 clean :
-	-rm -f $(DEBUG_OBJS) $(RELEASE_OBJS) $(OBJPATH)/*/lib/$(STATIC_LIB_NAME) $(OBJPATH)/*/lib/$(DYNAMIC_LIB_NAME)
+	-rm -f $(DEBUG_OBJS) $(RELEASE_OBJS) $(DEBUG_PIC_OBJS) $(RELEASE_PIC_OBJS) $(OBJPATH)/*/lib/$(STATIC_LIB_NAME) $(OBJPATH)/*/lib/$(DYNAMIC_LIB_NAME)
 
 .PHONY : depend
 depend: