--- deliantra/dclient/Makefile.am	2010/10/18 07:06:20	1.3
+++ deliantra/dclient/Makefile.am	2010/10/18 14:11:42	1.4
@@ -17,13 +17,17 @@
 DISTCLEANFILES			= # empty
 MAINTAINERCLEANFILES		= # empty
 
-AM_CPPFLAGS			= -I$(srcdir)/include -I/usr/include/ncursesw -isystem /usr/include/ncursesw -include adt/foreach.h -Dnullptr=NULL
+AM_CPPFLAGS			= -I$(srcdir)/include -I/usr/include/ncursesw -isystem /usr/include/ncursesw -include compiler.h
 AM_CXXFLAGS			= -pipe -O3 -ggdb3 -Wall -pedantic -std=c++0x -fno-inline
 AM_LDFLAGS			= -Wl,-z,defs,-z,nodlopen,-z,noexecstack,-z,now,-z,nodump
 
 BOOST				= -lboost_system-mt -lpthread
 CURSES				= -lpanelw -lmenuw -lncursesw
 
+#include src/common/Rules.am
+#include include/common/Rules.am
+#include testsuite/common/Rules.am
+
 include include/Rules.am
 include src/Rules.am
 include testsuite/Rules.am
@@ -34,7 +38,7 @@
 	$(RM) -r $(distdir)_$(host_cpu)
 
 dclient.static: all
-	$(CXX) `find . -name "*.o"` -static $(BOOST) $(CURSES) -lgpm -o $@
+	$(CXX) `find . -name "*.o"` -static $(BOOST) $(CURSES) -lgpm $(BFD) -o $@
 
 upload: dclient.static
 	cat $< | gzip > dclient.gz
@@ -42,4 +46,4 @@
 	echo -n "http://xinutec.org/~pippijn/files/up/dclient.gz" | xclip -i
 	$(RM) dclient.gz
 
-DISTCLEANFILES += curses.log deliantra.log
+DISTCLEANFILES += curses.log client.log