--- deliantra/server/Makefile.am	2006/05/07 08:19:27	1.2
+++ deliantra/server/Makefile.am	2006/09/08 04:53:11	1.13
@@ -1,10 +1,11 @@
+AUTOMAKE_OPTIONS = foreign
 
-CROSSEDIT = @CROSSEDIT@
-
-SUBDIRS = common random_maps socket server include lib utils doc plugins devel $(CROSSEDIT)
+SUBDIRS = include common random_maps socket server src lib utils pod
 
 EXTRA_DIST = AUTHORS ChangeLog COPYING DEVELOPERS autogen.sh run_win32.bat
 
+MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure Makefile
+
 DISTCHECK_CONFIGURE_FLAGS = --localstatedir=$$dc_install_base/var --mandir=$$dc_install_base/man
 
 archives: dist
@@ -14,7 +15,3 @@
 proto:
 	(cd common; make proto)
 	(cd server; make proto)
-	(cd plugins; make proto)
-	@if [ "X$(NO_X)" != "Xyes" ]; then \
-		(cd crossedit; make proto) \
-	fi