Change CDE version info for 2.3.1 release

[oweals/cde.git] / cde / Makefile

diff --git a/cde/Makefile b/cde/Makefile
index 187f039083813f90a9487389c15f0d60d8263830..875be9cc7ddd0a553c82a470237b0d1e11ec8c26 100644 (file)
--- a/cde/Makefile
+++ b/cde/Makefile
@@ -1,5 +1,5 @@
 # $TOG: Makefile /main/15 1999/10/12 09:33:30 mgreess $
-     RELEASE = Release 2.2.0
+     RELEASE = Release 2.3.1
      PRODUCT = CDE
        SHELL = /bin/sh
           RM = rm -f
@@ -7,7 +7,6 @@
         MAKE = make
        NMAKE = nmake
    WORLDOPTS = 
-WIN32WORLDOPTS = -i
          TOP = .
  CURRENT_DIR = .
    CONFIGSRC = $(TOP)/config
@@ -127,11 +126,11 @@ World.doc:
 # This is just a sequence of bootstrapping steps we have to do.
 # The steps are listed as separate targets so clearmake can wink in
 # the Makefile.proto files.
-Makefile.boot: imake.proto $(DEPENDSRC)/Makefile.proto depend.bootstrap $(IMAKESRC)/Makefile.proto imake.bootstrap
+Makefile.boot: imake.proto $(DEPENDSRC)/Makefile.proto depend.bootstrap $(IMAKESRC)/Makefile.proto imake.bootstrap $(DEPENDSRC)/proto.clean
 
 imake.proto:
        cd $(IMAKESRC) && $(MAKE) $(FLAGS)
-       $(RM) $(DEPENDSRC)/Makefile.proto
+       $(RM) $(DEPENDSRC)/Makefile.proto $(DEPENDSRC)/.depend
 
 $(DEPENDSRC)/Makefile.proto:
        $(IMAKE_CMD) -s $(DEPENDSRC)/Makefile.proto -f $(DEPENDSRC)/Imakefile -DTOPDIR=$(DEPENDTOP) -DCURDIR=$(DEPENDSRC)
@@ -146,42 +145,21 @@ $(IMAKESRC)/Makefile.proto:
 imake.bootstrap:
        cd $(IMAKESRC) && $(MAKE) -f Makefile.proto bootstrapdepend
        cd $(IMAKESRC) && $(MAKE) $(FLAGS) bootstrap
-       cd $(IMAKESRC) && $(MAKE) -f Makefile.proto all 
+       cd $(IMAKESRC) && $(MAKE) -f Makefile.proto all
        -@if [ -f xmakefile ]; then set -x; \
          $(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak; \
          else exit 0; fi
        $(MAKE) $(MFLAGS) xmakefile
 
+$(DEPENDSRC)/proto.clean:
+       cd $(DEPENDSRC) && $(RM) -r Makefile.proto
+
 Makefile::
        $(MAKE) $(MFLAGS) xmakefile
 
 xmakefile: Imakefile
        $(IMAKE_CMD) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
 
-World.Win32:
-       @echo :
-       @echo Building $(RELEASE) of $(PRODUCT).
-       @echo :
-       @echo :
-       cd $(IMAKESRC)
-       $(NMAKE) -f Makefile.ini clean.Win32
-       $(NMAKE) -f Makefile.ini imake.exe
-       cd ..\..
-       -if exist xmakefile.bak del xmakefile.bak
-       -if exist xmakefile ren xmakefile xmakefile.bak
-       $(IMAKE:/=\) -s xmakefile -I$(IRULESRC) $(IMAKE_DEFINES) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
-       $(NMAKE_CMD) $(MFLAGS) VerifyOS
-       $(NMAKE_CMD) $(MFLAGS) Makefiles
-       $(NMAKE_CMD) $(MFLAGS) clean
-       $(NMAKE_CMD) $(MFLAGS) includes
-       $(NMAKE_CMD) $(MFLAGS) depend
-       $(NMAKE_CMD) $(MFLAGS) $(WIN32WORLDOPTS)
-       @echo :
-       @echo :
-       @echo Full build of $(RELEASE) of $(PRODUCT) complete.
-       @echo :
-
-
 # don't allow any default rules in this Makefile
 .SUFFIXES: