--- deliantra/server/include/Makefile.am	2006/12/09 17:28:37	1.18
+++ deliantra/server/include/Makefile.am	2007/03/05 19:54:49	1.24
@@ -5,24 +5,24 @@
 define.h       loader.h       race.h         material.h     spells.h \
 face.h         logger.h       sproto.h \
 artifact.h     funcpoint.h    map.h          recipe.h       treasure.h \
-global.h       newclient.h    path.h         shstr.h        tod.h\
-god.h          newserver.h    xdir.h         \
+global.h       client.h       path.h         shstr.h        tod.h \
+god.h          network.h      crc.h \
 book.h         includes.h     object.h       skills.h	    sockproto.h \
 plugin.h       cfperl.h       eventinc.h     attackinc.h \
 kw_hash.h      keyword.h      traits.h       dynbuf.h       util.h \
-skillinc.h
+skillinc.h     callback.h
 
-EXTRA_DIST = event2inc
+EXTRA_DIST = event2inc preprocess callback.pl
 
 MAINTAINERCLEANFILES = Makefile.in stamp.preprocess
 
 eventinc.h: ../pod/events.pod event2inc
-	$(PERL) event2inc $< >$@
+	$(PERL) $(srcdir)/event2inc $< >$@
 
 keyword.h: stamp.preprocess
 
 kw_hash.h: stamp.preprocess
 
 stamp.preprocess: preprocess
-	$(PERL) preprocess && : > stamp.preprocess
+	$(PERL) $(srcdir)/preprocess GPERF '$(GPERF)' && : > stamp.preprocess