--- deliantra/server/server/Makefile.am	2007/03/05 19:54:49	1.22
+++ deliantra/server/server/Makefile.am	2007/03/05 20:07:04	1.23
@@ -1,11 +1,6 @@
-#
-# Makefile for crossfire 0.95.0 and beyond
-#
-# This file will eventually be replaced by a configure script.  But for
-# now, this simple makefile should do the job.
-#
 #   Copyright (C) 1992 Frank Tore Johansen
 #   Copyright (C) 2001 Mark Wedel
+#   Copyright (C) 2007 Marc Alexander Lehmann
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -68,7 +63,7 @@
 	weather.C\
 	dynbuf.C\
 	freezethaw.C\
-	cfperl.xs ../plugins/common/plugin_common.C
+	cfperl.xs plugin_common.C
 
 SUFFIXES = .xs
 
@@ -85,8 +80,7 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -DDATADIR=\"$(pkgdatadir)\" -DCONFDIR=\"$(pkgconfdir)\" \
 	      -DLIBDIR=\"$(pkglibdir)\" -DLOCALDIR=\"$(pkgstatedir)\" \
-	      -DPLUGIN_SUFFIX=\".so\" \
-	      -I$(top_srcdir)/plugins/common/include
+	      -DPLUGIN_SUFFIX=\".so\"
 
 LIBDL=
 crossfire_LDFLAGS=
@@ -94,13 +88,13 @@
 		../socket/libsocket.a $(LIBDL) $(PERLLIB)
 
 ../common/libcross.a:
-	( cd ../common ; make libcross.a )
+	( cd ../common ; $(MAKE) libcross.a )
 
 ../random_maps/librandom_map.a:
-	( cd ../random_maps ; make librandom_map.a )
+	( cd ../random_maps ; $(MAKE) librandom_map.a )
 
 ../socket/libsocket.a:
-	( cd ../socket ; make libsocket.a )
+	( cd ../socket ; $(MAKE) libsocket.a )
 
 # Check if everything is installed as it should
 installcheck-local: