X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=Makefile.am;h=80ad619f54f42bcaad72867ccf823dd158492e4a;hb=c15e543df80323dceb1786fa8c62123f8a50dfef;hp=a725fd7cfab0f363d462e8978fe6ff855839426e;hpb=4b00115f0583f729b287e7bc65da4760b738d9cd;p=captive.git

diff --git a/Makefile.am b/Makefile.am
index a725fd7..80ad619 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,18 +19,22 @@
 include $(top_srcdir)/Makefile-head.am
 
 AUTOMAKE_OPTIONS=gnu
-ACLOCAL_AMFLAGS=-I m4
-SUBDIRS=intl m4 macros src doc po
+ACLOCAL_AMFLAGS=-I macros
+SUBDIRS=macros src doc fonts yum.repos.d po
 ## to automatically rebuild aclocal.m4 if any of the macros in
 ## `macros/' change
 @MAINT@include macros/macros.dep
 @MAINT@macros/macros.dep: macros/Makefile.am
 @MAINT@	cd macros && $(MAKE) macros.dep
 
+REACTOS_SOURCES= \
+		reactos/hal \
+		reactos/include \
+		reactos/ntoskrnl
+
 EXTRA_DIST+= \
 		INSTALL \
-		ABOUT-NLS \
-		config.rpath \
+		THANKS \
 		mkinstalldirs \
 		captive.spec.in \
 		Makefile-head.am \
@@ -39,9 +43,33 @@ EXTRA_DIST+= \
 		.vimrc \
 		.gdbinit \
 		ChangeLog \
-		reactos/hal \
-		reactos/include \
-		reactos/ntoskrnl
+		$(REACTOS_SOURCES) \
+		debian/captive-lufs.files \
+		debian/captive-install.conffiles \
+		debian/captive-install.files \
+		debian/captive-install.postinst \
+		debian/captive-install.prerm \
+		debian/captive.conffiles \
+		debian/captive.docs \
+		debian/captive.files \
+		debian/captive.postinst \
+		debian/captive.postrm \
+		debian/changelog.in \
+		debian/control \
+		debian/copyright \
+		debian/rules \
+		cvs2cl-usermap \
+		gnome_vfs_read_entire_file.c \
+		build-static
+
+ROS_CVS:= \
+		$(foreach rosdir,$(REACTOS_SOURCES),$(shell find $(srcdir)/$(rosdir) -name CVS -type d))
+
+BUILT_SOURCES+= \
+		$(ROS_CVS)
+
+# Needed for dpkg-buildpackage(1):
+EXTRA_DIST+=debian/changelog
 
 MAINTAINERCLEANFILES+= \
 		ChangeLog
@@ -51,7 +79,7 @@ CLEANFILES+= \
 
 if MAINTAINER_MODE
 ChangeLog:
-	cvs2cl.pl --usermap cvs2cl-usermap --window 3600 --separate-header --no-wrap --file $@
+	cvs2cl --usermap cvs2cl-usermap --window 3600 --separate-header --no-wrap --file $@ . $(REACTOS_SOURCES)
 
 else
 ChangeLog: