Makefiles: support parallel compilation with -j

Fix dependencies in Makefiles to allow parallel compilation.

diff --git a/Makefile b/Makefile
index d502fdd766e156e71cfca3a4a911bd24e65e5945..fa56486597cb506381e8e757502cfe0800ee17d0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -42,10 +42,10 @@ tcl:
 tk:
        cd src/tk && $(MAKE) MAKEFLAGS=
 
 tk:
        cd src/tk && $(MAKE) MAKEFLAGS=
 

-tclx:
+tclx: tcl tk

        cd src/tclx && $(MAKE) MAKEFLAGS=
 
        cd src/tclx && $(MAKE) MAKEFLAGS=
 

-sim:
+sim: tclx

        cd src/sim && $(MAKE) MAKEFLAGS=
 
 clean: 
        cd src/sim && $(MAKE) MAKEFLAGS=
 
 clean: 

diff --git a/src/tclx/makefile b/src/tclx/makefile
index fae1059e473c9c15874e1000d81562202fe63fa0..cf90bb714ca4be5a430e14d2d01b8858e6cdad2e 100644 (file)
--- a/src/tclx/makefile
+++ b/src/tclx/makefile
@@ -65,7 +65,7 @@ libtcl.a: $(TCL_UCB_DIR)/libtcl.a
 
 wish: TKX_MAKES runwish
 
 
 wish: TKX_MAKES runwish
 

-TKX_MAKES: libtk.a
+TKX_MAKES: libtk.a tcl

        cd tkucbsrc; $(MAKE) -$(MAKEFLAGS) all
        cd tksrc;    $(MAKE) -$(MAKEFLAGS) all
 
        cd tkucbsrc; $(MAKE) -$(MAKEFLAGS) all
        cd tksrc;    $(MAKE) -$(MAKEFLAGS) all
 


@@ -83,7 +83,7 @@ libtk.a: $(TCL_TK_DIR)/libtk.a
 # Also generate a script to point the TCLDEFAULT environment variable
 # at this file for testing Tcl before its installed.
 
 # Also generate a script to point the TCLDEFAULT environment variable
 # at this file for testing Tcl before its installed.
 

-tcldef:
+tcldef: tcl

        @echo " -       Generating temporary TCLDEFAULT file.     -"
        @echo " - Use runtcl script to test Tcl before installing -"
        @echo " - Use runwish script to test Tk before installing -"
        @echo " -       Generating temporary TCLDEFAULT file.     -"
        @echo " - Use runtcl script to test Tcl before installing -"
        @echo " - Use runwish script to test Tk before installing -"


@@ -91,7 +91,7 @@ tcldef:
        @echo "set TCLPATH `pwd`/tcllib"                  >>tcldef
        @echo "set TCLINIT `pwd`/tcllib/tclinit.tcl"      >>tcldef
 
        @echo "set TCLPATH `pwd`/tcllib"                  >>tcldef
        @echo "set TCLINIT `pwd`/tcllib/tclinit.tcl"      >>tcldef
 

-runtcl:
+runtcl: tcldef

        @echo ':'                                              >runtcl
        @echo '# script for testing Tcl before installation'  >>runtcl
        @echo "TCLDEFAULT=`pwd`/tcldef"                       >>runtcl
        @echo ':'                                              >runtcl
        @echo '# script for testing Tcl before installation'  >>runtcl
        @echo "TCLDEFAULT=`pwd`/tcldef"                       >>runtcl