Replace broken str* functions with safe versions.

[platform/upstream/flac.git] / src / libFLAC / Makefile.lite

diff --git a/src/libFLAC/Makefile.lite b/src/libFLAC/Makefile.lite
index 9623397..7a7ec39 100644 (file)
--- a/src/libFLAC/Makefile.lite
+++ b/src/libFLAC/Makefile.lite
@@ -1,5 +1,5 @@
 #  libFLAC - Free Lossless Audio Codec library
-#  Copyright (C) 2001,2002,2003,2004,2005,2006,2007,2008  Josh Coalson
+#  Copyright (C) 2001,2002,2003,2004,2005,2006,2007,2008,2009  Josh Coalson
 #
 #  Redistribution and use in source and binary forms, with or without
 #  modification, are permitted provided that the following conditions
@@ -34,25 +34,34 @@
 
 topdir = ../..
 
+ifeq ($(OS),Darwin)
+    EXPLICIT_LIBS = $(OGG_EXPLICIT_LIBS) -lm
+else
+    LIBS = $(OGG_LIBS) -lm
+endif
+
 LIB_NAME = libFLAC
-ifeq ($(DARWIN_BUILD),yes)
-DEFINES = -DFLAC__CPU_PPC -DFLAC__USE_ALTIVEC -DFLAC__ALIGN_MALLOC_DATA
+ifeq ($(PROC),ppc)
+    DEFINES = -DFLAC__CPU_PPC -DFLAC__USE_ALTIVEC -DFLAC__ALIGN_MALLOC_DATA
+else
+ifeq ($(OS),Solaris)
+    DEFINES = -DFLAC__NO_ASM -DFLAC__ALIGN_MALLOC_DATA
 else
-ifeq ($(SOLARIS_BUILD),yes)
-DEFINES = -DFLAC__NO_ASM -DFLAC__ALIGN_MALLOC_DATA
+ifeq ($(PROC),i386)
+    DEFINES = -DFLAC__CPU_IA32 -DFLAC__USE_3DNOW -DFLAC__HAS_NASM -DFLAC__ALIGN_MALLOC_DATA
 else
-DEFINES = -DFLAC__CPU_IA32 -DFLAC__USE_3DNOW -DFLAC__HAS_NASM -DFLAC__ALIGN_MALLOC_DATA
+    DEFINES = -DFLAC__ALIGN_MALLOC_DATA
 endif
 endif
-INCLUDES = -I./include -I$(topdir)/include -I$(OGG_INCLUDE_DIR)
+endif
+INCLUDES = -I./include -I$(topdir)/include $(OGG_INCLUDES)
 DEBUG_CFLAGS = -DFLAC__OVERFLOW_DETECT
 
-ifeq ($(DARWIN_BUILD),yes)
+ifeq ($(OS),Darwin)
 SRCS_S = \
        ppc/as/lpc_asm.s
 else
-ifeq ($(SOLARIS_BUILD),yes)
-else
+ifeq ($(PROC),i386)
 SRCS_NASM = \
        ia32/bitreader_asm.nasm \
        ia32/cpu_asm.nasm \
@@ -62,6 +71,12 @@ SRCS_NASM = \
 endif
 endif
 
+OGG_SRCS_C = \
+       ogg_decoder_aspect.c \
+       ogg_encoder_aspect.c \
+       ogg_helper.c \
+       ogg_mapping.c
+
 SRCS_C = \
        bitmath.c \
        bitreader.c \
@@ -76,14 +91,11 @@ SRCS_C = \
        memory.c \
        metadata_iterators.c \
        metadata_object.c \
-       ogg_decoder_aspect.c \
-       ogg_encoder_aspect.c \
-       ogg_helper.c \
-       ogg_mapping.c \
        stream_decoder.c \
        stream_encoder.c \
        stream_encoder_framing.c \
-       window.c
+       window.c \
+       $(OGG_SRCS)
 
 include $(topdir)/build/lib.mk