Makefile.def (host fixincludes): Specify missing targets.

2004-11-05  Paolo Bonzini  <bonzini@gnu.org>

	* Makefile.def (host fixincludes): Specify missing targets.
	* Makefile.in: Regenerate.

fixincludes/ChangeLog:
2004-11-05  Paolo Bonzini  <bonzini@gnu.org>

	* Makefile.in (mostlyclean, distclean): New targets.

From-SVN: r90127

5 files changed, 32 insertions, 94 deletions

diff --git a/ChangeLog b/ChangeLog
index a74415b..e3296b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-05  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.def (host fixincludes): Specify missing targets.
+	* Makefile.in: Regenerate.
+
 2004-11-05  Ralf Corsepius  <ralf.corsepius@rtems.org>
 
 	* MAINTAINERS: Add myself
diff --git a/Makefile.def b/Makefile.def
index 5ac362e..4167b88 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -51,7 +51,12 @@ host_modules= { module= fastjar; no_check_cross= true; };
 host_modules= { module= fileutils; };
 host_modules= { module= findutils; };
 host_modules= { module= find; };
-host_modules= { module= fixincludes; };
+host_modules= { module= fixincludes;
+		missing= info;
+		missing= dvi;
+		missing= TAGS;
+		missing= install-info;
+		missing= installcheck; };
 host_modules= { module= flex; no_check_cross= true; };
 host_modules= { module= gas; bootstrap=true; };
 host_modules= { module= gcc; bootstrap=true; 
diff --git a/Makefile.in b/Makefile.in
index 7505ccb..4b12703 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -8085,24 +8085,8 @@ maybe-info-fixincludes:
 @if fixincludes
 maybe-info-fixincludes: info-fixincludes
 
-info-fixincludes: \
-    configure-fixincludes 
-	@[ -f ./fixincludes/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in fixincludes" ; \
-	(cd fixincludes && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
+# fixincludes doesn't support info.
+info-fixincludes:
 
 @endif fixincludes
 
@@ -8111,24 +8095,8 @@ maybe-dvi-fixincludes:
 @if fixincludes
 maybe-dvi-fixincludes: dvi-fixincludes
 
-dvi-fixincludes: \
-    configure-fixincludes 
-	@[ -f ./fixincludes/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in fixincludes" ; \
-	(cd fixincludes && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
+# fixincludes doesn't support dvi.
+dvi-fixincludes:
 
 @endif fixincludes
 
@@ -8137,24 +8105,8 @@ maybe-TAGS-fixincludes:
 @if fixincludes
 maybe-TAGS-fixincludes: TAGS-fixincludes
 
-TAGS-fixincludes: \
-    configure-fixincludes 
-	@[ -f ./fixincludes/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in fixincludes" ; \
-	(cd fixincludes && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
+# fixincludes doesn't support TAGS.
+TAGS-fixincludes:
 
 @endif fixincludes
 
@@ -8163,25 +8115,8 @@ maybe-install-info-fixincludes:
 @if fixincludes
 maybe-install-info-fixincludes: install-info-fixincludes
 
-install-info-fixincludes: \
-    configure-fixincludes \
-    info-fixincludes 
-	@[ -f ./fixincludes/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in fixincludes" ; \
-	(cd fixincludes && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
+# fixincludes doesn't support install-info.
+install-info-fixincludes:
 
 @endif fixincludes
 
@@ -8190,24 +8125,8 @@ maybe-installcheck-fixincludes:
 @if fixincludes
 maybe-installcheck-fixincludes: installcheck-fixincludes
 
-installcheck-fixincludes: \
-    configure-fixincludes 
-	@[ -f ./fixincludes/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in fixincludes" ; \
-	(cd fixincludes && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
+# fixincludes doesn't support installcheck.
+installcheck-fixincludes:
 
 @endif fixincludes
 
diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index cfc2806..28f1ab9 100644
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-05  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.in (mostlyclean, distclean): New targets.
+
 2004-11-04  Geoffrey Keating  <geoffk@apple.com>
 
 	* configure.ac: Add code to determine noncanonical_target,
diff --git a/fixincludes/Makefile.in b/fixincludes/Makefile.in
index b2b6cc6..a0e9d94 100644
--- a/fixincludes/Makefile.in
+++ b/fixincludes/Makefile.in
@@ -126,10 +126,15 @@ fixinc.sh : fixinc.in mkfixinc.sh Makefile
 $(srcdir)/fixincl.x: @MAINT@ fixincl.tpl inclhack.def
 	cd $(srcdir) ; $(SHELL) ./genfixes
 
-clean:
+mostlyclean:
 	rm -f *.o *-stamp $(AF) $(FI) *~
 
-maintainer-clean : clean
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile config.h config.log config.status stamp-h
+
+maintainer-clean: distclean
 	rm -f $(srcdir)/fixincl.x
 
 Makefile: $(srcdir)/Makefile.in config.status