From b9d8b9e927fe33d12bd9c14ee6c0db09384404b2 Mon Sep 17 00:00:00 2001
From: Josh Coalson <jcoalson@users.sourceforce.net>
Date: Wed, 14 Feb 2007 05:47:38 +0000
Subject: [PATCH] remove special makefile variants for libiconv on darwin

---
 build/config.mk                 | 4 +---
 src/flac/Makefile.lite          | 2 +-
 src/metaflac/Makefile.lite      | 2 +-
 src/plugin_common/Makefile.lite | 4 ----
 src/plugin_xmms/Makefile.lite   | 2 +-
 src/share/utf8/Makefile.lite    | 4 ----
 6 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/build/config.mk b/build/config.mk
index e553759b..6d60916c 100644
--- a/build/config.mk
+++ b/build/config.mk
@@ -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
diff --git a/src/flac/Makefile.lite b/src/flac/Makefile.lite
index 59f6bb49..7d1795fe 100644
--- a/src/flac/Makefile.lite
+++ b/src/flac/Makefile.lite
@@ -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
diff --git a/src/metaflac/Makefile.lite b/src/metaflac/Makefile.lite
index 21a557dc..56dba518 100644
--- a/src/metaflac/Makefile.lite
+++ b/src/metaflac/Makefile.lite
@@ -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
diff --git a/src/plugin_common/Makefile.lite b/src/plugin_common/Makefile.lite
index 93db7c8e..987bae8d 100644
--- a/src/plugin_common/Makefile.lite
+++ b/src/plugin_common/Makefile.lite
@@ -22,11 +22,7 @@
 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 = \
diff --git a/src/plugin_xmms/Makefile.lite b/src/plugin_xmms/Makefile.lite
index ffd92163..7ed8db17 100644
--- a/src/plugin_xmms/Makefile.lite
+++ b/src/plugin_xmms/Makefile.lite
@@ -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
diff --git a/src/share/utf8/Makefile.lite b/src/share/utf8/Makefile.lite
index 65b0a5d3..95e4a7fa 100644
--- a/src/share/utf8/Makefile.lite
+++ b/src/share/utf8/Makefile.lite
@@ -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 \