dev-tcltk/blt: parallel-make fix

This fixes blt for parallel builds.  It should be upstreamable to the
blt project.

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

3 files changed, 249 insertions, 5 deletions

diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index 5a74ab0..f03b974 100644
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -7,6 +7,7 @@ AUX blt-2.4z-gentoo-libdir.patch 2621 SHA256 3483f95a1d4f549413c3964fa5b9b7fbbe2
 AUX blt-2.4z-ldflags-v2.patch 5447 SHA256 e676423ffb20eb6989f373ff71404c732243b4c66a46ed49f8fd3bb622d74333 SHA512 6bd1d638eaa563fac9c44be017dfdf8d5b425b99729bf3c62919273a75c5d43ff9c096084c84bc1248c05e940877e3488d7a9f67cb6ed95262cce45b16985853 WHIRLPOOL b08c8c113b4fa715ab330ca85dfc5714be1dff86f0bda2f0ac1aa6499fd46c3fbd49de7fdbb6b42d9a2f0080a7814f817a29fe7f3651eeda7e51cdf7c5792716
 AUX blt-2.4z-ldflags.patch 1086 SHA256 20245d45dfb0e96afe1127fa40209a7881fbd3f3880ef04af9496809a308f06e SHA512 d2e19fc9caab2ae013c01e66c9674906bda2f01190bf6e9da93c2d22cb4a36a167f7de34649e6d3efc84b0094b1710fc3380347367830dc012873c3845716445 WHIRLPOOL bd0564162e27c97ecca7c8c017345d005871aec2f97bebf8f4a7b2667f4163f051df58379649e40b8c200b4155d2b6049cdf3e2db15753b715a2aa4adabd8467
 AUX blt-2.4z-linking.patch 684 SHA256 cd19df698ca40ce743c81fe2c18dce615a6db385c6a973b9a14201f45e5467a2 SHA512 09ad0d4b43d51b33020a13ecbe31d04d5ddcdf2134d0c0e1275b4de3127adad624d222f492a6d9b0a4f198537afb30d9af70f8685668bf7eba966f020c34368e WHIRLPOOL a5a993a06467a81e1987c04bd709859c725f438b5aa334b2eb1c3806567447dbc290f9a464800919d7fdb5ca0832053d1da9fc91346dc4455ea18ec353e10875
+AUX blt-2.4z-parallelmake.patch 8988 SHA256 26359c11981d521e32de11b19096b14ab93d4c346a8cb348adce6ced475a96c6 SHA512 810b50439c05c2f83174070a9863cef920359127c1af5d04bfe6a33ac8ee03a7c7ebfbf29c365c9a74efd964c2a6423973ee8f44e4b6ac90635b494388b6b603 WHIRLPOOL c31714fd6ae0a6b6abb75a6b9901bb05e5933f230e57664a7c69bdfb0cdfa363c9d2cdabddfbd293887f393ca9fae038f38ecb968445f91ea74cb82a6d2715dc
 AUX blt-2.4z-r13-fix-makefile.patch 509 SHA256 0ac21b9e7fc3e9e5bb7a44d195d8d6cdba05216cf2d9d09709bfc4628d371de1 SHA512 77f432a8ae319ae552a0803c949e4de3e4d1ce258d1f41347481f162d084668c125971ccea5e4fc53dd806054596a4d620786aca41275789c393cf499c9a93b4 WHIRLPOOL e16dc72e20e83de59684a0936c2571fa5ea00c7b20e91e54abc6eb3a7e5fdd7c328e9ea2a16a48fa7288dc8642d33b245fad3a4113a14770bc95349f08a2d76a
 AUX blt-2.4z-r4-fix-makefile.patch 817 SHA256 fd8ada3720c85856770f4770a93f4e668a75de3cf68d35d25597215996e023e8 SHA512 c3b9aedc9c0557a10f66f0d1f9e61a028367e190fcb49ae0af8acdacc5a466168f4a1f26012a8b4f6aceb644adc532bcf0e1348cd0231efd821b66107cf5c7b9 WHIRLPOOL 2f54db3233eb62e805d072448d31c5dd7c69d8fb15aec902a1f12c8b7e82aa6ff9604504b1b021a4dbaf3b00cc2ee0974bb0f5bd0f176f475b41c8a6a3fc0e70
 AUX blt-2.4z-r4-fix-makefile2.patch 728 SHA256 aece52e1771d097498cf88bb1fe286ac698a46af0d07163c4b9d184440ab7d39 SHA512 5f9b5ab26101bf89bb7161bd4bfb4974144c61ae692f67b7598fe0c42929f84b14ac459fdfc29a1436b64924085b8047c90a84501c031f9d8575d4dc38c22681 WHIRLPOOL d76b7c2e350e562401a4b247b6f29e4286c35c2ca100e8b28892d63bf5874bfe1e3d8ef817bde66a43c3b2c2d81d6af8b08a87622d97d783c1e1480bb472ce87
@@ -17,6 +18,6 @@ AUX blt2.4z-64bit.patch 891 SHA256 a0a3da1016eea86279d1648f4390b38083484582bdb5b
 AUX blt2.4z-install.diff 1057 SHA256 6849139557c2846c332c4d81b04c03872933adfef0fa8432d6b757cfd02774c8 SHA512 2786eb7d59ef4f3e0b2e846f906e6f92cece13b8003ed220ddcdd22b42b761fa6aa31905a3a62af54e02db96bda37e21fae2361589d8c393586c37bcd33ef842 WHIRLPOOL a0db9fdc9d2199ac0e217015826a0ffe7b70c619e55e85a13a941202be3a325356cde627714d16d315f1647b5f95d16a6219720048b14560fdf7445c170995b2
 AUX pkgIndex.tcl 146 SHA256 79ff9c41afa3157d6f180dce21ddf82f5a55ed24a274eea0eeef511ec2f2659d SHA512 fedb327153b670f370773c1b57f7f831c291962fb375e27ba0b31314a94128edc7a4e6b9377e7c19426beb672fcb9b1b10f7e45ca0f197e19863b40d27bef439 WHIRLPOOL b3f6534323e28097656cfd2ff42433e07460d6dc3b247ed666712b7e664e086421640ff2320e8d71e5037e07fcefd690b845c9dd08e54baf0562c8659919bc6d
 DIST blt2.4z-8.5.2.tar.gz 2326234 SHA256 e4e60628f79e1899175b51a3398133131fac52021b9b9019b4483525c48d6d16 SHA512 afc465ba47ae43a0c6be17400d0a572dccd8c2a8adfd8fc3ed50f9ec28d02129f069d88096c1428c4b242550131092b4141035d7ce90c9e7181ccf712502f09a WHIRLPOOL a00a029e075916dd7656ca85acb308a48e6d80563a91ada9e9e7df7518ef0d4de2200b54e5d9c8a9602520c03472e73968956c0df30afb8ef7f7b364fdd5524f
-EBUILD blt-2.4z-r13.ebuild 3497 SHA256 e41f49c79fd24c64078c131c682350dc7320bf7dd272c051d84cf54cc4dee120 SHA512 d14444e6796fe522e85a27f60acfd25bd9ebadd86f0af7254f43dbf790dbb8ac1730bc23745446cae52d657efff169b29ef9cf37ffba6962b713393812c3ab23 WHIRLPOOL 1daaf9b98baea87b3812054f54e12cd3525e62c37ab0c2c934200a54207a73bc90c88f38526132b0d73b6eddd9b01ddc8e17e7a751b5d5f3b183927f6e19f293
+EBUILD blt-2.4z-r13.ebuild 3504 SHA256 bd8f98760de84f5928dc95420289682772c46941d1a4b224af615f4d985f5403 SHA512 5c5ab1d788acd2f0c3a5735d6e99777904c2ff50ac8241d5a2b12d3b289156f8cb69b104df19f13e552fcfc0f9620adf7407bff158b6085fddc6cdd393995ce6 WHIRLPOOL 95c927709b7112f08b513f866f585e09778294da49d964130ee5abc4cf031a596ee7bfa5fddb9eb608c04c466feda4223a7fa9fb95c6c05f30ee6a4bc9ae16fc
 MISC ChangeLog 9103 SHA256 a0c8bf63e3325dbfc6ac1c0c18b6499c02c3739720ccfe19096a38ca5647b122 SHA512 0997e28c1b3f9a166ba6c94baba7a1e1aa043901251b83d8dd42edbe9d21b7ffe8a19d3a1f555c55f2a8959239c4d3b3fb1693598610428516e7742171fc61e2 WHIRLPOOL 10be00d2671bfade334975ce2405b8eac227aa88c0843fe7bc17fc47b7dfa715166ef58d602d3bd519079c86fd863aa1d5d199cd3875b793018869368239630c
 MISC metadata.xml 160 SHA256 225a6f78d287329cdf2f4ed57468be28bd6565fd9a62207c2cc48e25ac9d3537 SHA512 a50627bda9ed953daf422b5a2e89b5b64e296d1a023d767c8a4ebb2cd51cd0036cecce455762a54e7d669f94d17d9de21052bac94fc08b1365ef42eb2f267742 WHIRLPOOL 61fa22d50aaf2bdecc467e26c9675cf7949ad55a4a8821730c91d1bd73f83fc4c35660851961310efa450e337a7ef572a925e186b8b05984d6315efc509fd365
diff --git a/dev-tcltk/blt/blt-2.4z-r13.ebuild b/dev-tcltk/blt/blt-2.4z-r13.ebuild
index e062a26..658f0d3 100644
--- a/dev-tcltk/blt/blt-2.4z-r13.ebuild
+++ b/dev-tcltk/blt/blt-2.4z-r13.ebuild
@@ -29,9 +29,6 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}${PV}${MY_V_SUFFIX}"
 
-# parallel borks
-MAKEOPTS+=" -j1"
-
 src_prepare() {
 	epatch "${FILESDIR}/blt-2.4z-r13-fix-makefile.patch"
 	epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile2.patch"
@@ -57,7 +54,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-aclocal.patch \
 		"${FILESDIR}"/${P}-deprecated-ac-output.patch \
 		"${FILESDIR}"/${P}-gentoo-libdir.patch \
-		"${FILESDIR}"/${P}-ar-withval.patch
+		"${FILESDIR}"/${P}-ar-withval.patch \
+		"${FILESDIR}"/${P}-parallelmake.patch
 
 	append-cflags -fPIC
 
diff --git a/dev-tcltk/blt/files/blt-2.4z-parallelmake.patch b/dev-tcltk/blt/files/blt-2.4z-parallelmake.patch
new file mode 100644
index 0000000..1180886
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.4z-parallelmake.patch
@@ -0,0 +1,245 @@
+diff -urpN blt2.4z-8.5.2.orig/src/Makefile-cyg.in blt2.4z-8.5.2/src/Makefile-cyg.in
+--- blt2.4z-8.5.2.orig/src/Makefile-cyg.in	2014-01-01 11:21:15.500369543 -0800
++++ blt2.4z-8.5.2/src/Makefile-cyg.in	2014-01-01 11:21:31.386295765 -0800
+@@ -166,45 +166,54 @@ VPATH =		$(srcdir)
+ 
+ all: $(tcl_only_lib_so) $(lib_so) $(bltsh) $(bltwish) 
+ 
+-$(bltwish): $(lib_a) $(srcdir)/tkConsole.c $(srcdir)/bltWinMain.c
++tkConsole_tcltk.o: $(srcdir)/tkConsole.c
++	$(CC) $(CC_SWITCHES) -DTCLLIBPATH=\"$(TCLLIBPATH)\" \
++		$< -c -o $@
++bltWinMain_tcltk.o: $(srcdir)/bltWinMain.c
++	$(CC) $(CC_SWITCHES) -DTCLLIBPATH=\"$(TCLLIBPATH)\" \
++		$< -c -o $@
++
++$(bltwish): $(lib_a) tkConsole_tcltk.o bltWinMain_tcltk.o
+ 	$(RM) $(bltwish)
+ 	$(CC) $(CC_SWITCHES) $(LDFLAGS) -o $(bltwish) \
+-		-DTCLLIBPATH=\"$(TCLLIBPATH)\" \
+-		$(srcdir)/bltWinMain.c $(srcdir)/tkConsole.c \
++		bltWinMain_tcltk.o tkConsole_tcltk.o \
+ 		$(lib_a) $(LIBS)
+ 
+-$(bltsh): $(tcl_only_lib_a) $(srcdir)/bltWinMain.c
++bltWinMain_tclonly.o: $(srcdir)/bltWinMain.c
++	$(CC) $(CC_SWITCHES) -DTCLLIBPATH=\"$(TCLLIBPATH)\" -DTCL_ONLY \
++		$< -c -o $@
++
++$(bltsh): $(tcl_only_lib_a) bltWinMain_tclonly.o
+ 	$(RM) $(bltsh)
+-	$(CC) $(CC_SWITCHES) $(LDFLAGS) -DTCL_ONLY -o $(bltsh) \
+-		-DTCLLIBPATH=\"$(TCLLIBPATH)\" \
+-		$(srcdir)/bltWinMain.c $(tcl_only_lib_a) $(TCL_ONLY_LIBS) 
++	$(CC) $(CC_SWITCHES) $(LDFLAGS) -o $(bltsh) \
++		bltWinMain_tclonly.o $(tcl_only_lib_a) $(TCL_ONLY_LIBS) 
+ 
+-$(lib_a): $(OBJS) $(srcdir)/bltInit.c
+-	$(CC) -c $(CC_SWITCHES) -DBLT_LIBRARY=\"$(BLT_LIBRARY)\" \
+-		$(srcdir)/bltInit.c
++bltInit_tcltk.o: $(srcdir)/bltInit.c
++	$(CC) $(CC_SWITCHES) -DBLT_LIBRARY=\"$(BLT_LIBRARY)\" \
++		$< -c -o $@
++
++$(lib_a): $(OBJS) bltInit_tcltk.o
+ 	$(RM) $@
+-	$(AR) $@ $(OBJS) bltInit.o
++	$(AR) $@ $(OBJS) bltInit_tcltk.o
+ 	$(RANLIB) $@
+ 
+-$(lib_so): $(OBJS)
+-	$(CC) -c $(CC_SWITCHES) -DBLT_LIBRARY=\"$(BLT_LIBRARY)\" \
+-		$(srcdir)/bltInit.c
++$(lib_so): $(OBJS) bltInit_tcltk.o
+ 	$(RM) $@
+-	$(SHLIB_LD) $(SHLIB_LD_FLAGS) ${LDFLAGS} -o $@ bltInit.o $(OBJS) $(LIBS) \
++	$(SHLIB_LD) $(SHLIB_LD_FLAGS) ${LDFLAGS} -o $@ bltInit_tcltk.o $(OBJS) $(LIBS) \
+ 		$(EXTRA_SHLIB_FLAGS)
+ 
+-$(tcl_only_lib_a):  $(TCL_ONLY_OBJS) $(srcdir)/bltInit.c
++bltInit_tclonly.o: $(srcdir)/bltInit.c
+ 	$(CC) -c $(CC_SWITCHES) -DTCL_ONLY -DBLT_LIBRARY=\"$(BLT_LIBRARY)\" \
+-		$(srcdir)/bltInit.c
++		$< -c -o $@
++
++$(tcl_only_lib_a):  $(TCL_ONLY_OBJS) bltInit_tclonly.o
+ 	$(RM) $@
+-	$(AR) $@ $(TCL_ONLY_OBJS) bltInit.o
++	$(AR) $@ $(TCL_ONLY_OBJS) bltInit_tclonly.o
+ 	$(RANLIB) $@
+ 
+-$(tcl_only_lib_so):  $(TCL_ONLY_OBJS) $(srcdir)/bltInit.c
+-	$(CC) -c $(CC_SWITCHES) -DTCL_ONLY -DBLT_LIBRARY=\"$(BLT_LIBRARY)\" \
+-		$(srcdir)/bltInit.c
++$(tcl_only_lib_so):  $(TCL_ONLY_OBJS) bltInit_tclonly.o
+ 	$(RM) $@
+-	$(SHLIB_LD) $(SHLIB_LD_FLAGS) ${LDFLAGS} -o $@ bltInit.o $(TCL_ONLY_OBJS) \
++	$(SHLIB_LD) $(SHLIB_LD_FLAGS) ${LDFLAGS} -o $@ bltInit_tclonly.o $(TCL_ONLY_OBJS) \
+ 		$(TCL_ONLY_LIBS)
+ 
+ install: mkdirs install-lib install-demo install-headers
+@@ -244,7 +253,7 @@ xref:
+ 	$(XREF) $(XREFFLAGS) $(DEFINES) $(INCLUDES) $(SRCS)
+ 
+ clean:
+-	$(RM) $(OBJS) bltInit.o $(lib_a) $(tcl_only_lib_a) \
++	$(RM) $(OBJS) bltInit_tclOnly.o bltInit_tcltk.o $(lib_a) $(tcl_only_lib_a) \
+ 		$(lib_so) $(tcl_only_lib_so) \
+ 		$(bltsh)* $(bltwish)* .pure* *~
+ 
+diff -urpN blt2.4z-8.5.2.orig/src/Makefile.in blt2.4z-8.5.2/src/Makefile.in
+--- blt2.4z-8.5.2.orig/src/Makefile.in	2014-01-01 11:21:15.500369543 -0800
++++ blt2.4z-8.5.2/src/Makefile.in	2014-01-01 11:22:59.330423312 -0800
+@@ -160,30 +160,37 @@ all: $(bltsh) $(bltwish) @SHLIB_TARGET@
+ build_shared:
+ 	(cd shared; $(MAKE) CFLAGS="$(CFLAGS)" all) 
+ 
+-$(bltwish): $(lib_a) $(srcdir)/bltUnixMain.c
++bltUnixMain_tcltk.o: $(srcdir)/bltUnixMain.c
++	$(CC) $(CC_SWITCHES) -DTCLLIBPATH=\"$(TCLLIBPATH)\" \
++		$< -c -o $@
++bltUnixMain_tclonly.o: $(srcdir)/bltUnixMain.c
++	$(CC) $(CC_SWITCHES) -DTCL_ONLY -DTCLLIBPATH=\"$(TCLLIBPATH)\" \
++		$< -c -o $@
++bltInit_tcltk.o: $(srcdir)/bltInit.c
++	$(CC) $(CC_SWITCHES) -DTCLLIBPATH=\"$(TCLLIBPATH)\" \
++		$< -c -o $@
++bltInit_tclonly.o: $(srcdir)/bltInit.c
++	$(CC) $(CC_SWITCHES) -DTCL_ONLY -DTCLLIBPATH=\"$(TCLLIBPATH)\" \
++		$< -c -o $@
++
++$(bltwish): $(lib_a) bltUnixMain_tcltk.o
+ 	$(RM) $(bltwish)
+ 	$(CC) $(CC_SWITCHES) $(LDFLAGS) -o $(bltwish) \
+-		-DTCLLIBPATH=\"$(TCLLIBPATH)\" \
+-		$(srcdir)/bltUnixMain.c $(lib_a) $(LIBS) 
++		bltUnixMain_tcltk.o $(lib_a) $(LIBS) 
+ 
+-$(bltsh): $(tcl_only_lib_a) $(srcdir)/bltUnixMain.c
++$(bltsh): $(tcl_only_lib_a) bltUnixMain_tclonly.o
+ 	$(RM) $(bltsh)
+-	$(CC) $(CC_SWITCHES) $(LDFLAGS) -DTCL_ONLY -o $(bltsh) \
+-		-DTCLLIBPATH=\"$(TCLLIBPATH)\" \
+-		$(srcdir)/bltUnixMain.c $(tcl_only_lib_a) $(TCL_ONLY_LIBS) 
+-
+-$(lib_a): $(OBJS) $(srcdir)/bltInit.c
+-	$(CC) -c $(CC_SWITCHES) -DBLT_LIBRARY=\"$(BLT_LIBRARY)\" \
+-		$(srcdir)/bltInit.c
++	$(CC) $(CC_SWITCHES) $(LDFLAGS) -o $(bltsh) \
++		bltUnixMain_tclonly.o $(tcl_only_lib_a) $(TCL_ONLY_LIBS) 
++
++$(lib_a): $(OBJS) bltInit_tcltk.o
+ 	$(RM) $@
+-	$(AR) $@ $(OBJS) bltInit.o
++	$(AR) $@ $(OBJS) bltInit_tcltk.o
+ 	$(RANLIB) $@
+ 
+-$(tcl_only_lib_a):  $(TCL_ONLY_OBJS) $(srcdir)/bltInit.c
+-	$(CC) -c $(CC_SWITCHES) -DTCL_ONLY -DBLT_LIBRARY=\"$(BLT_LIBRARY)\" \
+-		$(srcdir)/bltInit.c
++$(tcl_only_lib_a):  $(TCL_ONLY_OBJS) bltInit_tclonly.o
+ 	$(RM) $@
+-	$(AR) $@ $(TCL_ONLY_OBJS) bltInit.o
++	$(AR) $@ $(TCL_ONLY_OBJS) bltInit_tclonly.o
+ 	$(RANLIB) $@
+ 
+ install: mkdirs install-lib install-demo install-headers
+@@ -224,8 +231,9 @@ xref:
+ 	$(XREF) $(XREFFLAGS) $(DEFINES) $(INCLUDES) $(SRCS)
+ 
+ clean:
+-	$(RM) $(OBJS) bltInit.o $(lib_a) $(tcl_only_lib_a) \
+-		$(bltsh)* $(bltwish)* *pure* .pure*
++	$(RM) $(OBJS) bltInit_tcltk.o bltInit_tclonly.o $(lib_a) $(tcl_only_lib_a) \
++		$(bltsh)* $(bltwish)* *pure* .pure* bltUnixMain_quant.o \
++		bltUnixMain_tcltk.o bltUnixMain_tclonly.o
+ 	(cd shared; $(MAKE) clean) 
+ 
+ distclean: clean
+@@ -237,11 +245,17 @@ distclean: clean
+ 	$(CC) -c $(CC_SWITCHES) $<
+ 
+ PUREFLAGS=
+-pure: $(lib_a)
++bltUnixMain_pure.o: $(srcdir)/bltUnixMain.c
+ 	$(PURIFYHOME)/purify $(PUREFLAGS) $(CC) $(CC_SWITCHES) \
+-		$(srcdir)/bltUnixMain.c -o bltwish $(lib_a) $(LIBS)
++		$< -c -o $@
++pure: $(lib_a) bltUnixMain_pure.o
++	$(PURIFYHOME)/purify $(PUREFLAGS) $(CC) $(CC_SWITCHES) \
++		-o bltwish bltUnixMain_pure.o $(lib_a) $(LIBS)
+ 
+ QUANTIFYFLAGS=
+-quant: $(lib_a)
++bltUnixMain_quant.o: $(srcdir)/bltUnixMain.c
++	$(QUANTIFYHOME)/quantify $(QUANTIFYFLAGS) $(CC) $(CC_SWITCHES) \
++		$< -c -o $@
++quant: $(lib_a) bltUnixMain_quant.o
+ 	$(QUANTIFYHOME)/quantify $(QUANTIFYFLAGS) $(CC) $(CC_SWITCHES) \
+-		$(srcdir)/bltUnixMain.c -o bltwish $(lib_a) $(LIBS)
++		-o bltwish bltUnixMain_quant.o $(lib_a) $(LIBS)
+diff -urpN blt2.4z-8.5.2.orig/src/shared/Makefile.in blt2.4z-8.5.2/src/shared/Makefile.in
+--- blt2.4z-8.5.2.orig/src/shared/Makefile.in	2014-01-01 11:21:15.500369543 -0800
++++ blt2.4z-8.5.2/src/shared/Makefile.in	2014-01-01 11:21:31.387295823 -0800
+@@ -127,31 +127,39 @@ all: build_lib build_demo
+ 
+ build_demo: $(bltwish) $(bltsh)
+ 
+-$(bltwish): $(lib_so)
++bltUnixMain_tcltk.o: $(srcdir)/bltUnixMain.c
++	$(CC) $(CC_SWITCHES) $< -c -o $@
++bltUnixMain_tclonly.o: $(srcdir)/bltUnixMain.c
++	$(CC) $(CC_SWITCHES) -DTCL_ONLY $< -c -o $@
++
++$(bltwish): $(lib_so) bltUnixMain_tcltk.o
+ 	$(RM) $(bltwish)
+ 	$(CC) $(CC_SWITCHES) $(LDFLAGS) -o $(bltwish) \
+-		$(srcdir)/bltUnixMain.c $(lib_so) $(LIBS) 
++		bltUnixMain_tcltk.o $(lib_so) $(LIBS) 
+ 
+-$(bltsh): $(tcl_only_lib_so)
++$(bltsh): $(tcl_only_lib_so) bltUnixMain_tclonly.o
+ 	$(RM) $(bltsh)
+-	$(CC) $(CC_SWITCHES) $(LDFLAGS) -DTCL_ONLY -o $(bltsh) \
+-		$(srcdir)/bltUnixMain.c $(tcl_only_lib_so) \
++	$(CC) $(CC_SWITCHES) $(LDFLAGS) -o $(bltsh) \
++		bltUnixMain_tclonly.o $(tcl_only_lib_so) \
+ 		$(TCL_ONLY_LIB_SPECS) 
+ 
+ build_lib: $(lib_so) $(tcl_only_lib_so)
+ 
+-$(lib_so): $(OBJS)
++bltInit_tcltk.o: $(srcdir)/bltInit.c
+ 	$(CC) -c $(CC_SWITCHES) -DBLT_LIBRARY=\"$(scriptdir)\" \
+-		$(srcdir)/bltInit.c
++		$< -c -o $@
++bltInit_tclonly.o: $(srcdir)/bltInit.c
++	$(CC) -c $(CC_SWITCHES) -DTCL_ONLY -DBLT_LIBRARY=\"$(scriptdir)\" \
++		$< -c -o $@
++
++$(lib_so): $(OBJS) bltInit_tcltk.o
+ 	$(RM) $@
+-	$(SHLIB_LD) $(SHLIB_LD_FLAGS) $(LDFLAGS) -o $@ bltInit.o $(OBJS) \
++	$(SHLIB_LD) $(SHLIB_LD_FLAGS) $(LDFLAGS) -o $@ bltInit_tcltk.o $(OBJS) \
+ 		$(SHLIB_LIB_SPECS) $(LIBS)
+ 
+-$(tcl_only_lib_so): $(TCL_ONLY_OBJS)
+-	$(CC) -c $(CC_SWITCHES) -DTCL_ONLY -DBLT_LIBRARY=\"$(scriptdir)\" \
+-		$(srcdir)/bltInit.c
++$(tcl_only_lib_so): $(TCL_ONLY_OBJS) bltInit_tclonly.o
+ 	$(RM) $@
+-	$(SHLIB_LD) $(SHLIB_LD_FLAGS) $(LDFLAGS) -o $@ bltInit.o $(TCL_ONLY_OBJS) \
++	$(SHLIB_LD) $(SHLIB_LD_FLAGS) $(LDFLAGS) -o $@ bltInit_tclonly.o $(TCL_ONLY_OBJS) \
+ 		$(SHLIB_TCL_ONLY_LIB_SPECS)  $(LIBS)
+ 
+ install: mkdirs install-lib install-demo
+@@ -175,7 +185,8 @@ mkdirs:
+         done
+ clean:
+ 	$(RM) $(OBJS) $(lib_so) $(tcl_only_lib_so) $(bltwish) $(bltsh) \
+-		*pure* .pure* bltInit.o
++		*pure* .pure* bltInit_tcltk.o bltInit_tclonly.o \
++		bltUnixMain_tclonly.o bltUnixMain_tcltk.o
+ 
+ distclean: clean
+ 	$(RM) Makefile $(srcdir)/*.bak $(srcdir)/*\~ $(srcdir)/"#"*