update Makefile.lite system to work on x86_64 linux

[flac.git] / src / flac / Makefile.lite

diff --git a/src/flac/Makefile.lite b/src/flac/Makefile.lite
index 696e8de..558a18b 100644 (file)
--- a/src/flac/Makefile.lite
+++ b/src/flac/Makefile.lite
@@ -1,5 +1,5 @@
 #  flac - Command-line FLAC encoder/decoder
-#  Copyright (C) 2000,2001,2002,2003,2004  Josh Coalson
+#  Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007,2008  Josh Coalson
 #
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License
@@ -20,27 +20,23 @@
 #
 
 topdir = ../..
+libdir = $(topdir)/obj/$(BUILD)/lib
 
 PROGRAM_NAME = flac
-ifeq ($(DARWIN_BUILD),yes)
-INCLUDES     = -I./include -I$(topdir)/include
-LIBS         = -lgrabbag -lFLAC -lreplaygain_analysis -lreplaygain_synthesis -lgetopt -lutf8 -lc -lm
-else
-#@@@ TODO: conditionalize ogg includes, defines, and -logg
-ifeq ($(SOLARIS_BUILD),yes)
-INCLUDES     = -I./include -I$(topdir)/include -I$(HOME)/local/include -DFLAC__HAS_OGG
-LIBS         = -lgrabbag -lOggFLAC -lFLAC -lreplaygain_analysis -lreplaygain_synthesis -lgetopt -lutf8 -lm -L$(HOME)/local/lib -logg
+
+INCLUDES = -I./include -I$(topdir)/include -I$(OGG_INCLUDE_DIR)
+
+ifeq ($(OS),Darwin)
+EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libFLAC.a $(libdir)/libreplaygain_analysis.a $(libdir)/libreplaygain_synthesis.a $(libdir)/libgetopt.a $(libdir)/libutf8.a $(OGG_LIB_DIR)/libogg.a -liconv -lm
 else
-#@@@ TODO: conditionalize ogg includes, defines, and -logg
-INCLUDES     = -I./include -I$(topdir)/include -I$(HOME)/local/include -DFLAC__HAS_OGG
-LIBS         = -lgrabbag -lOggFLAC -lFLAC -lreplaygain_analysis -lreplaygain_synthesis -lgetopt -lutf8 -lm -L$(HOME)/local/lib -logg
-endif
+LIBS = -lgrabbag -lFLAC -lreplaygain_analysis -lreplaygain_synthesis -lgetopt -lutf8 -L$(OGG_LIB_DIR) -logg -lm
 endif
 
 SRCS_C = \
        analyze.c \
        decode.c \
        encode.c \
+       foreign_metadata.c \
        local_string_utils.c \
        main.c \
        utils.c \