--- Makefile.orig	2009-04-27 06:03:30.000000000 -0500
+++ Makefile	2009-08-03 01:51:20.000000000 -0500
@@ -20,9 +20,8 @@
 
 include Makefile.cfg
 
-export CC = gcc -pthread
 export CFLAGS += -I. -Wall -Os -ggdb -D_GNU_SOURCE -fPIC
-export LDLIBS += -lncursesw
+export LDLIBS += -lncursesw -liconv
 
 VERSION := 0.20
 
@@ -48,8 +47,8 @@
 	rm -f stfl.pc
 
 Makefile.deps: *.c widgets/*.c *.h
-	$(CC) -I. -MM *.c > Makefile.deps_new
-	$(CC) -I. -MM widgets/*.c | sed 's,^wt_[^ ]*\.o: ,widgets/&,' >> Makefile.deps_new
+	$(CC) $(CFLAGS) $(LDLIBS) -MM *.c > Makefile.deps_new
+	$(CC) $(CFLAGS) $(LDLIBS) -MM widgets/*.c | sed 's,^wt_[^ ]*\.o: ,widgets/&,' >> Makefile.deps_new
 	mv -f Makefile.deps_new Makefile.deps
 
 install: all stfl.pc
@@ -66,18 +65,6 @@
 include spl/Makefile.snippet
 endif
 
-ifeq ($(FOUND_SWIG)$(FOUND_PERL5),11)
-include perl5/Makefile.snippet
-endif
-
-ifeq ($(FOUND_SWIG)$(FOUND_PYTHON),11)
-include python/Makefile.snippet
-endif
-
-ifeq ($(FOUND_SWIG)$(FOUND_RUBY),11)
-include ruby/Makefile.snippet
-endif
-
 .PHONY: all clean install install_spl
 
 include Makefile.deps