From kde-commits  Thu Mar 04 09:01:03 2004
From: Klas Kalass <klas.kalass () gmx ! de>
Date: Thu, 04 Mar 2004 09:01:03 +0000
To: kde-commits
Subject: kdeextragear-3
Message-Id: <20040304090103.9630990CD () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=107839087222356

CVS commit by kalass: 

fix compilation by including most contents of deps.am directly and adding SUBDIRS explicitely


  M +23 -2     Makefile.am.in   1.7


--- kdeextragear-3/Makefile.am.in  #1.6:1.7
@@ -1,7 +1,28 @@
 AUTOMAKE_OPTIONS = foreign 1.5
 
-include admin/deps.am
+# include contents of admin/deps.am with copy and paste, because 
+# we need a different rule for acinclude.m4
+
+$(top_srcdir)/configure.in: $(top_srcdir)/subdirs $(top_srcdir)/configure.files $(top_srcdir)/admin/cvs.sh
+        @cd $(top_srcdir) && $(SHELL) admin/cvs.sh configure_in
+
+$(top_srcdir)/configure.files: $(top_srcdir)/subdirs $(CONF_FILES)
+        @cd $(top_srcdir) && $(SHELL) admin/cvs.sh configure.files $(top_srcdir)/admin/cvs.sh
+
+$(top_srcdir)/Makefile.am: $(top_srcdir)/Makefile.am.in $(top_srcdir)/subdirs $(top_srcdir)/admin/cvs.sh
+        @cd $(top_srcdir) && $(SHELL) admin/cvs.sh Makefile_am
+
+$(top_srcdir)/subdirs: $(top_srcdir)/Makefile.am.in $(top_srcdir)/admin/cvs.sh
+        @cd $(top_srcdir) && $(SHELL) admin/cvs.sh subdirs
+
+# defining default rules for files that may not be present
+$(top_srcdir)/Makefile.am.in:
+$(CONF_FILES):
+
 include admin/Doxyfile.am
 
-$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/*/*.m4
+SUBDIRS=$(TOPSUBDIRS)
+
+$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in\
+        $(top_srcdir)/admin/libtool.m4.in $(wildcard $(top_srcdir)/*/*.m4)
         @cd $(top_srcdir) && cat $^ > acinclude.m4
\ No newline at end of file