nx-X11/config/{imake,makedepend}: Use system-wide available imake and makedepend tools.

1 files changed, 7 insertions, 64 deletions

diff --git a/nx-X11/Makefile b/nx-X11/Makefile
index e6b2f77ab..7a3ece799 100644
--- a/nx-X11/Makefile
+++ b/nx-X11/Makefile
@@ -8,7 +8,7 @@
 # Luna users will need to either run make as "make MAKE=make"
 # or add "MAKE = make" to this file.
 
-RELEASE = "Release 6.9"
+RELEASE = "Release $(shell cat ../VERSION)"
 SHELL = /bin/sh
 RM = rm -f
 MV = mv
@@ -17,16 +17,11 @@ WIN32WORLDOPTS = -i
 TOP = .
 CURRENT_DIR = .
 CONFIGSRC = $(TOP)/config
-IMAKESRC = $(CONFIGSRC)/imake
-DEPENDSRC = $(CONFIGSRC)/makedepend
-DEPENDTOP = ../..
-IMAKETOP = ../..
 IRULESRC = $(CONFIGSRC)/cf
-IMAKE = $(IMAKESRC)/imake
+IMAKE = imake
 IMAKE_CMD = $(IMAKE) -I$(IRULESRC) $(IMAKE_DEFINES)
 MAKE_OPTS = -f xmakefile
 MAKE_CMD = $(MAKE) $(MAKE_OPTS)
-FLAGS = $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)" CC="$(CC)"
 
 all:
 	@${MAKE} ${MAKE_OPTS} xmakefile-exists || $(MAKE) all-initial
@@ -34,8 +29,7 @@ all:
 
 all-initial:
 	@echo Please use make World, or on NT use nmake World.Win32.
-	@echo Check the configuration parameters in the $(IRULESRC) directory,
-	@echo and pass BOOTSTRAPCFLAGS if necessary.
+	@echo
 	@echo Read the release notes carefully before proceeding.
 	@echo Do not name your log file make.log or it will be deleted.
 
@@ -43,11 +37,6 @@ World:
 	@echo ""
 	@echo Building $(RELEASE).
 	@echo ""
-	@case "x$(BOOTSTRAPCFLAGS)" in x) \
-	echo I hope you checked the configuration parameters in $(IRULESRC) ; \
-	echo to see if you need to pass BOOTSTRAPCFLAGS. ; \
-	echo "" ; \
-	;; esac;
 	@date
 	@echo ""
 	@if [ -f xmakefile ]; then \
@@ -55,31 +44,9 @@ World:
 	    ${MAKE} ${MAKE_OPTS} -k clean || \
 	    $(RM) xmakefile; \
 	fi
-	@if [ ! -f $(IRULESRC)/host.def ]; then \
-	    if [ ! -f $(TOP)/lib/Xt/Imakefile ]; then \
-		echo "#define BuildServersOnly YES" > $(IRULESRC)/host.def; \
-	    else \
-		if [ ! -f $(TOP)/fonts/Imakefile ]; then \
-		    echo "#define BuildFonts NO" > $(IRULESRC)/host.def; \
-		else \
-		    echo "" > $(IRULESRC)/host.def; \
-		fi; \
-	    fi; \
-	fi
-#	@rm -f $(IRULESRC)/version.def; echo "" > $(IRULESRC)/version.def;
 	@rm -f $(IRULESRC)/date.def; echo "" > $(IRULESRC)/date.def;
-#	@if [ ! -f $(IRULESRC)/version.def ]; then \
-#	    rm -f $(IRULESRC)/version.def; \
-#	    echo "" > $(IRULESRC)/version.def; \
-#	fi
-#	@if [ ! -f $(IRULESRC)/date.def ]; then \
-#	    rm -f $(IRULESRC)/date.def; \
-#	    echo "" > $(IRULESRC)/date.def; \
-#	fi
-	cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean
-	$(MAKE) $(MFLAGS) Makefile.boot
+	${MAKE} $(MFLAGS) xmakefile
 	${MAKE} ${MAKE_OPTS} $(MFLAGS) version.def
-	$(MAKE) $(MFLAGS) Makefile.boot
 	${MAKE} ${MAKE_OPTS} $(MFLAGS) VerifyOS
 	${MAKE} ${MAKE_OPTS} $(MFLAGS) Makefiles
 	${MAKE} ${MAKE_OPTS} $(MFLAGS) BOOTSTRAPSUBDIRS= clean
@@ -98,37 +65,13 @@ World:
 # The steps are listed as separate targets so clearmake can wink in
 # the Makefile.proto files.
 
-Makefile.boot: imake.bootstrap
-	$(RM) $(IMAKESRC)/Makefile.proto
-
-imake.proto:
-	cd $(IMAKESRC) && $(MAKE) $(FLAGS)
-	$(RM) $(DEPENDSRC)/Makefile.proto
-
-$(DEPENDSRC)/Makefile.proto: imake.proto
-	$(IMAKE_CMD) -s $(DEPENDSRC)/Makefile.proto -f $(DEPENDSRC)/Imakefile -DTOPDIR=$(DEPENDTOP) -DCURDIR=$(DEPENDSRC)
-
-depend.bootstrap: $(DEPENDSRC)/Makefile.proto
-	cd $(DEPENDSRC) && $(RM) -r Makefile Makefile.dep makedepend *.o bootstrap
-	cd $(DEPENDSRC) && $(MAKE) -f Makefile.proto bootstrap
-
-$(IMAKESRC)/Makefile.proto: depend.bootstrap
-	$(IMAKE_CMD) -s $(IMAKESRC)/Makefile.proto -f $(IMAKESRC)/Imakefile -DTOPDIR=$(IMAKETOP) -DCURDIR=$(IMAKESRC) -DBootStrap
-
-imake.bootstrap: $(IMAKESRC)/Makefile.proto
-	cd $(IMAKESRC) && $(MAKE) -f Makefile.proto bootstrapdepend
-	cd $(IMAKESRC) && $(MAKE) $(FLAGS) bootstrap
-	cd $(IMAKESRC) && $(MAKE) -f Makefile.proto imakeonly
-	-@if [ -f xmakefile ]; then set -x; \
-	  $(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak; \
-	  else exit 0; fi
-	$(MAKE) $(MFLAGS) xmakefile
-
 Makefile::
 	$(MAKE) $(MFLAGS) xmakefile
 
 xmakefile: Imakefile
-	$(RM) xmakefile
+	@if [ -f xmakefile ]; then set -x; \
+	 $(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak; \
+	 else exit 0; fi
 	@rm -f $(IRULESRC)/date.def; echo "" > $(IRULESRC)/date.def;
 	$(IMAKE_CMD) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)