--- deliantra/server/Makefile.am	2016/11/18 03:30:08	1.32
+++ deliantra/server/Makefile.am	2017/09/16 22:45:22	1.36
@@ -22,17 +22,27 @@
 # The authors can be reached via e-mail to <support@deliantra.net>
 #
 
-SUBDIRS = include lib ext utils doc
+pkgstatedir = @pkgstatedir@
+pkgconfdir = @pkgconfdir@
+PERL = @PERL@
+
+SUBDIRS = lib
 
 EXTRA_DIST = AUTHORS Changes COPYING.GNU COPYING.Affero autogen.sh TODO \
              common/README \
              socket/README \
              random_maps/Notes \
-             server/typemap server/genacc server/genconst
+             server/typemap server/genacc server/genconst \
+             utils/metaserver.pl.in utils/player_dl.pl.in utils/player_dl.html utils/cfutil.in \
+             doc/historic doc/development \
+             ext/*.pm ext/*.ext \
+             include/event2inc include/genkeywords include/callback.pl
 
 CLEANFILES = server/const_iv.h server/perlxsi.c
 
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure Makefile
+MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure Makefile \
+                       utils/cfutil utils/Makefile.in \
+                       include/keyword.h include/kw_hash.h
 
 DISTCHECK_CONFIGURE_FLAGS = --localstatedir=$$dc_install_base/var --mandir=$$dc_install_base/man
 
@@ -42,12 +52,14 @@
 
 #############################################################################
 
-bin_PROGRAMS = server/deliantra-server
+bin_PROGRAMS = server/deliantra-server utils/cfhq2xa
+nodist_bin_SCRIPTS = utils/cfutil
 
 #############################################################################
+# server/, socket/, common/, random_maps/
 
 server_deliantra_server_LDFLAGS=
-server_deliantra_server_LDADD = $(LIBDL) $(PERLLIB)
+server_deliantra_server_LDADD = $(LIBDL) $(PERLLIB) $(EXTRA_LDADD)
 
 server_deliantra_server_SOURCES = \
 	socket/image.C \
@@ -168,8 +180,7 @@
                 $(abs_top_srcdir)/server/cfperl.xs >cfperl.C~ && mv cfperl.C~ cfperl.C
 
 #############################################################################
-
-pkgstatedir = @pkgstatedir@
+# pod/
 
 poddir=$(pkgdatadir)/pod
 dist_pod_DATA = pod/command_help.pod pod/dmcommand_help.pod pod/emote_help.pod pod/books.pod pod/generic_help.pod
@@ -177,6 +188,68 @@
 dist_noinst_DATA = pod/events.pod
 
 #############################################################################
+# utils/
+
+utils_cfhq2xa_SOURCES = utils/cfhq2xa.C
+
+#############################################################################
+# doc/
+
+dist-hook:
+	rm -rf `find $(distdir)/doc -name CVS`
+
+#############################################################################
+# ext/
+
+OLDEXT = 00_map_handling.ext cfplus_build.ext clientchk.ext db-scheduler.ext \
+         guildrules.ext map-prefetch.ext schmorp-clientchk.ext schmorp.irc.ext slag_ex.ext
+
+PERL = @PERL@
+
+install-data-local:
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/ext
+	for i in $(srcdir)/ext/*.pm $(srcdir)/ext/*.ext; do \
+		$(INSTALL_DATA) "$$i" $(DESTDIR)$(pkgdatadir)/ext; \
+	done
+	(cd $(DESTDIR)$(pkgdatadir)/ext/ && rm -f $(OLDEXT))
+
+# Uninstall unchanged config/var files so make distcheck is happy
+# but leave changed file, so no configuration/game state is lost
+uninstall-local:
+	-cd $(srcdir)/ext && \
+	for i in *.pm *.ext; do \
+		rm -f $(DESTDIR)$(pkgdatadir)/ext/"$$i"; \
+	done
+
+#############################################################################
+# include/
+
+noinst_HEADERS = \
+        include/devel.h      include/libproto.h include/sounds.h    include/attack.h \
+        include/Makefile.in  include/config.h   include/living.h    include/player.h     include/slotinc.h \
+        include/define.h     include/race.h     include/material.h  include/spells.h     include/rproto.h \
+        include/face.h       include/logger.h   include/sproto.h    include/region.h     include/rmg.h \
+        include/artifact.h   include/map.h      include/recipe.h    include/treasure.h   include/noise.h \
+        include/global.h     include/client.h   include/path.h      include/shstr.h      include/tod.h \
+        include/god.h        include/network.h  include/crc.h       include/shstrinc.h   include/layout.h \
+        include/book.h       include/includes.h include/object.h    include/skills.h	 include/sockproto.h \
+        include/cfperl.h     include/eventinc.h include/attackinc.h include/compiler.h   include/rng.h \
+        include/kw_hash.h    include/keyword.h  include/traits.h    include/dynbuf.h     include/util.h \
+        include/skillinc.h   include/callback.h include/evthread.h  include/freezethaw.h include/quadland.h
+
+BUILT_SOURCES = include/eventinc.h include/keyword.h include/kw_hash.h
+
+include/eventinc.h: pod/events.pod include/event2inc
+	$(PERL) $(srcdir)/include/event2inc $< >$@
+
+include/keyword.h: include/genkeywords
+	$(PERL) $(srcdir)/include/genkeywords GPERF '$(GPERF)'
+
+include/kw_hash.h: include/keyword.h
+
+
+#############################################################################
 
 tags: ctags