remove special makefile variants for libiconv on darwin
authorJosh Coalson <jcoalson@users.sourceforce.net>
Wed, 14 Feb 2007 05:47:38 +0000 (05:47 +0000)
committerJosh Coalson <jcoalson@users.sourceforce.net>
Wed, 14 Feb 2007 05:47:38 +0000 (05:47 +0000)
build/config.mk
src/flac/Makefile.lite
src/metaflac/Makefile.lite
src/plugin_common/Makefile.lite
src/plugin_xmms/Makefile.lite
src/share/utf8/Makefile.lite

index e553759..6d60916 100644 (file)
@@ -40,12 +40,10 @@ all default: $(DEFAULT_BUILD)
 # GNU makefile fragment for emulating stuff normally done by configure
 #
 
-VERSION=\"1.1.4-alpha1\"
+VERSION=\"1.1.4\"
 
 ifeq ($(DARWIN_BUILD),yes)
 CONFIG_CFLAGS=-DHAVE_INTTYPES_H -DHAVE_ICONV -DHAVE_LANGINFO_CODESET -DFLAC__HAS_OGG -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFLAC__SYS_DARWIN -DWORDS_BIGENDIAN
-ICONV_INCLUDE_DIR=$(HOME)/local.i18n/include
-ICONV_LIB_DIR=$(HOME)/local.i18n/lib
 else
 CONFIG_CFLAGS=-DHAVE_INTTYPES_H -DHAVE_ICONV -DHAVE_LANGINFO_CODESET -DHAVE_SOCKLEN_T -DFLAC__HAS_OGG -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 endif
index 59f6bb4..7d1795f 100644 (file)
@@ -27,7 +27,7 @@ PROGRAM_NAME = flac
 INCLUDES = -I./include -I$(topdir)/include -I$(OGG_INCLUDE_DIR)
 
 ifeq ($(DARWIN_BUILD),yes)
-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 -L$(ICONV_LIB_DIR) -liconv -lm
+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
 LIBS = -lgrabbag -lFLAC -lreplaygain_analysis -lreplaygain_synthesis -lgetopt -lutf8 -L$(OGG_LIB_DIR) -logg -lm
 endif
index 21a557d..56dba51 100644 (file)
@@ -27,7 +27,7 @@ PROGRAM_NAME = metaflac
 INCLUDES = -I./include -I$(topdir)/include -I$(OGG_INCLUDE_DIR)
 
 ifeq ($(DARWIN_BUILD),yes)
-EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libFLAC.a $(libdir)/libreplaygain_analysis.a $(libdir)/libgetopt.a $(libdir)/libutf8.a $(OGG_LIB_DIR)/libogg.a -L$(ICONV_LIB_DIR) -liconv -lm
+EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libFLAC.a $(libdir)/libreplaygain_analysis.a $(libdir)/libgetopt.a $(libdir)/libutf8.a $(OGG_LIB_DIR)/libogg.a -liconv -lm
 else
 LIBS = -lgrabbag -lFLAC -lreplaygain_analysis -lgetopt -lutf8 -L$(OGG_LIB_DIR) -logg -lm
 endif
index 93db7c8..987bae8 100644 (file)
 topdir = ../..
 
 LIB_NAME = libplugin_common
-ifeq ($(DARWIN_BUILD),yes)
-INCLUDES = -I$(topdir)/include -I$(HOME)/local/include -I$(ICONV_INCLUDE_DIR)
-else
 INCLUDES = -I$(topdir)/include -I$(HOME)/local/include
-endif
 DEFINES  = 
 
 SRCS_C = \
index ffd9216..7ed8db1 100644 (file)
@@ -25,7 +25,7 @@ LIB_NAME  = libxmms-flac
 INCLUDES  = $(shell xmms-config --cflags) -I./include -I$(topdir)/include -I..
 # refer to the static libs explicitly
 ifeq ($(DARWIN_BUILD),yes)
-LIBS = $(topdir)/obj/$(BUILD)/lib/libFLAC.a $(topdir)/obj/$(BUILD)/lib/libplugin_common.a $(topdir)/obj/$(BUILD)/lib/libgrabbag.a $(topdir)/obj/$(BUILD)/lib/libreplaygain_analysis.a $(topdir)/obj/$(BUILD)/lib/libreplaygain_synthesis.a $(OGG_LIB_DIR)/libogg.a -L$(ICONV_LIB_DIR) -liconv -lstdc++ -lz
+LIBS = $(topdir)/obj/$(BUILD)/lib/libFLAC.a $(topdir)/obj/$(BUILD)/lib/libplugin_common.a $(topdir)/obj/$(BUILD)/lib/libgrabbag.a $(topdir)/obj/$(BUILD)/lib/libreplaygain_analysis.a $(topdir)/obj/$(BUILD)/lib/libreplaygain_synthesis.a $(OGG_LIB_DIR)/libogg.a -liconv -lstdc++ -lz
 else
 LIBS = $(topdir)/obj/$(BUILD)/lib/libFLAC.a $(topdir)/obj/$(BUILD)/lib/libplugin_common.a $(topdir)/obj/$(BUILD)/lib/libgrabbag.a $(topdir)/obj/$(BUILD)/lib/libreplaygain_analysis.a $(topdir)/obj/$(BUILD)/lib/libreplaygain_synthesis.a -L$(OGG_LIB_DIR) -logg -lstdc++ -lz
 endif
index 65b0a5d..95e4a7f 100644 (file)
@@ -5,11 +5,7 @@
 topdir = ../../..
 
 LIB_NAME = libutf8
-ifeq ($(DARWIN_BUILD),yes)
-INCLUDES = -I$(topdir)/include -I$(topdir)/include/share -I$(ICONV_INCLUDE_DIR)
-else
 INCLUDES = -I$(topdir)/include -I$(topdir)/include/share
-endif
 
 SRCS_C = \
        charset.c \