ChangeLogTag: Fri Dec 3 23:15:18 2004 Marek Brudka <mbrudka@aster.pl>

31 files changed, 284 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index 31455d33259..1727a542aa9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+Fri Dec  3 23:10:39 2004  Marek Brudka  <mbrudka@aster.pl>
+
+	* bin/MakeProjectCreator/config/tao_qtreactor.mpb (Added):
+	* bin/MakeProjectCreator/config/ace_xt.mpb (Added):
+	* bin/MakeProjectCreator/config/ace_x11.mpb (Added):
+	* bin/MakeProjectCreator/config/ace_tk.mpb (Added):
+	* bin/MakeProjectCreator/config/ace_qtreactor.mpb (Added):
+	* bin/MakeProjectCreator/config/ace_gtk.mpb (Added):
+	* bin/MakeProjectCreator/config/ace_gl.mpb (Added):
+	* bin/MakeProjectCreator/config/ace_fltk.mpb (Added):
+	* ace/ace_xtreactor.mpc (Added):
+	* ace/ace_tkreactor.mpc (Added):
+	* ace/ace_qtreactor.mpc (Added):
+	* ace/ace_flreactor.mpc (Added):
+
+	* tests/tests.mpc (Modified):
+	* include/makeinclude/wrapper_macros.GNU (Modified):
+	* include/makeinclude/platform_sunos5_sunc++.GNU (Modified):
+	* include/makeinclude/platform_sunos5_g++.GNU (Modified):
+	* include/makeinclude/platform_lynxos.GNU (Modified):
+	* include/makeinclude/platform_linux_pgi.GNU (Modified):
+	* include/makeinclude/platform_linux_icc.GNU (Modified):
+	* include/makeinclude/platform_linux_borland.GNU (Modified):
+	* include/makeinclude/platform_linux.GNU (Modified):
+	* bin/MakeProjectCreator/config/acedefaults.mpb (Modified):
+	* bin/MakeProjectCreator/config/ace_qt.mpb (Modified):
+	* ace/ace.mwc (Modified):
+	* ace/ace.mpc (Modified):
+	Initial changes related with the separation of reactors into distinct libraries.
+	Many thanks to Raphael Bossek <raphael.bossek@gmx.de> for this patch.
+
 Thu Dec  2 13:38:33 2004  Chad Elliott  <elliott_c@ociweb.com>
 
         * apps/soreduce/Library.h:
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 44da7f40db5..b2dddbfc203 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Fri Dec  3 23:15:18 2004  Marek Brudka  <mbrudka@aster.pl>
+
+	* tao/tao_xtreactor.mpc (Added):
+	* tao/tao_qtreactor.mpc (Added):
+	* tests/QtTests/QtTests.mpc (Modified):
+	* tao/tao.mpc (Modified):
+	Initial changes related with the separation of reactors into distinct libraries.
+	Many thanks to Raphael Bossek <raphael.bossek@gmx.de> for this patch.
+
 Thu Dec  2 13:11:22 2004  Dale Wilson  <wilson_d@ociweb.com>
 
         * orbsvcs/orbsvcs/Notify/Topology_Object.h:
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index 34819bd2bfd..02439fdf4bf 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -56,8 +56,6 @@ project(TAO) : acelib, taoversion, core, tao_output, taodefaults, pidl, extra_co
       default_client.cpp
       default_server.cpp
       default_resource.cpp
-      xt_resource.cpp
-      qt_resource.cpp
     }
     Interpretive_Marshaling {
       append.cpp
diff --git a/TAO/tao/tao_qtreactor.mpc b/TAO/tao/tao_qtreactor.mpc
new file mode 100644
index 00000000000..3a68f0bc24e
--- /dev/null
+++ b/TAO/tao/tao_qtreactor.mpc
@@ -0,0 +1,10 @@
+project(TAO_QtReactor) : acelib, taolib, taoversion, core, tao_output, taodefaults, ace_qt {
+  sharedname   = TAO_QtReactor
+  dynamicflags += TAO_BUILD_DLL
+
+  Source_Files(TAO_COMPONENTS) {
+    Default_Resources {
+      qt_resource.cpp
+	}
+  }
+}
diff --git a/TAO/tao/tao_xtreactor.mpc b/TAO/tao/tao_xtreactor.mpc
new file mode 100644
index 00000000000..a94632be0be
--- /dev/null
+++ b/TAO/tao/tao_xtreactor.mpc
@@ -0,0 +1,11 @@
+project(TAO_XtReactor) : acelib, taolib, taoversion, core, tao_output, taodefaults, ace_xt {
+  requires     += xt_reactor
+  sharedname   = TAO_XtReactor
+  dynamicflags = TAO_BUILD_DLL
+
+  Source_Files(TAO_COMPONENTS) {
+    Default_Resources {
+      xt_resource.cpp
+	}
+  }
+}
diff --git a/TAO/tests/QtTests/QtTests.mpc b/TAO/tests/QtTests/QtTests.mpc
index 1013e370e62..7c80f73c23a 100644
--- a/TAO/tests/QtTests/QtTests.mpc
+++ b/TAO/tests/QtTests/QtTests.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, ace_qt, qt_moc {
+project(*server): taoexe, portableserver, tao_qtreactor {
   requires += qt
 
   MOC_Files {
@@ -15,7 +15,7 @@ project(*server): taoexe, portableserver, ace_qt, qt_moc {
   }
 }
 
-project(*client): taoexe, ace_qt, qt_moc {
+project(*client): taoexe, tao_qtreactor {
   requires += qt
 
   MOC_Files {
diff --git a/ace/ace.mpc b/ace/ace.mpc
index 7f251355452..5e149fefb8e 100644
--- a/ace/ace.mpc
+++ b/ace/ace.mpc
@@ -1,7 +1,7 @@
 //  -*- MPC -*- now wouldn't this be cool...
 // $Id$
 
-project(ACE) : acedefaults, aceversion, core, qt_reactor, other, codecs, token, svcconf, uuid, filecache {
+project(ACE) : acedefaults, aceversion, core, other, codecs, token, svcconf, uuid, filecache {
   libout       = $(ACE_ROOT)/lib
   sharedname   = ACE
   dynamicflags = ACE_BUILD_DLL
@@ -160,7 +160,6 @@ project(ACE) : acedefaults, aceversion, core, qt_reactor, other, codecs, token,
 
     Demux {
       Event_Handler.cpp
-      FlReactor.cpp
       Msg_WFMO_Reactor.cpp
       POSIX_Proactor.cpp
       POSIX_CB_Proactor.cpp
@@ -173,10 +172,7 @@ project(ACE) : acedefaults, aceversion, core, qt_reactor, other, codecs, token,
       SUN_Proactor.cpp
       Dev_Poll_Reactor.cpp
       TP_Reactor.cpp
-      TkReactor.cpp
       WFMO_Reactor.cpp
-      XtReactor.cpp
-      QtReactor.cpp
     }
 
     Connection {
diff --git a/ace/ace.mwc b/ace/ace.mwc
index 0ae6180ea24..c2b2802414b 100644
--- a/ace/ace.mwc
+++ b/ace/ace.mwc
@@ -3,6 +3,10 @@
 
 workspace {
   ace.mpc
+  ace_flreactor.mpc
+  ace_qtreactor.mpc
+  ace_tkreactor.mpc
+  ace_xtreactor.mpc
   QoS
   RMCast
   SSL
diff --git a/ace/ace_flreactor.mpc b/ace/ace_flreactor.mpc
new file mode 100644
index 00000000000..b01cdb39093
--- /dev/null
+++ b/ace/ace_flreactor.mpc
@@ -0,0 +1,14 @@
+//  -*- MPC -*- now wouldn't this be cool...
+// ace_flreactor.mpc,v
+
+project(ACE_FlReactor) : acedefaults, aceversion, core, acelib, ace_fltk {
+  libout       = $(ACE_ROOT)/lib
+  sharedname   = ACE_FlReactor
+  dynamicflags = ACE_BUILD_DLL ACE_OS_BUILD_DLL
+
+  Source_Files(ACE_COMPONENTS) {
+	Demux {
+      FlReactor.cpp
+    }
+  }
+}
diff --git a/ace/ace_qtreactor.mpc b/ace/ace_qtreactor.mpc
new file mode 100644
index 00000000000..f4c28609912
--- /dev/null
+++ b/ace/ace_qtreactor.mpc
@@ -0,0 +1,18 @@
+//  -*- MPC -*- now wouldn't this be cool...
+// ace_qtreactor.mpc,v
+
+project(ACE_QtReactor) : acedefaults, aceversion, core, acelib, ace_qt, qt_moc {
+  libout       = $(ACE_ROOT)/lib
+  sharedname   = ACE_QtReactor
+  dynamicflags = ACE_BUILD_DLL ACE_OS_BUILD_DLL
+
+  MOC_Files {
+    QtReactor.h
+  }
+  Source_Files(ACE_COMPONENTS) {
+    Demux {
+      QtReactor_moc.cpp
+      QtReactor.cpp
+    }
+  }
+}
diff --git a/ace/ace_tkreactor.mpc b/ace/ace_tkreactor.mpc
new file mode 100644
index 00000000000..63cee20e940
--- /dev/null
+++ b/ace/ace_tkreactor.mpc
@@ -0,0 +1,14 @@
+//  -*- MPC -*- now wouldn't this be cool...
+// ace_tkreactor.mpc,v
+
+project(ACE_TkReactor) : acedefaults, aceversion, core, acelib, ace_tk {
+  libout       = $(ACE_ROOT)/lib
+  sharedname   = ACE_TkReactor
+  dynamicflags = ACE_BUILD_DLL ACE_OS_BUILD_DLL
+
+  Source_Files(ACE_COMPONENTS) {
+	Demux {
+      TkReactor.cpp
+    }
+  }
+}
diff --git a/ace/ace_xtreactor.mpc b/ace/ace_xtreactor.mpc
new file mode 100644
index 00000000000..86b425a0b8a
--- /dev/null
+++ b/ace/ace_xtreactor.mpc
@@ -0,0 +1,14 @@
+//  -*- MPC -*- now wouldn't this be cool...
+// ace_xtreactor.mpc,v
+
+project(ACE_XtReactor) : acedefaults, aceversion, core, acelib, ace_xt {
+  libout       = $(ACE_ROOT)/lib
+  sharedname   = ACE_XtReactor
+  dynamicflags = ACE_BUILD_DLL ACE_OS_BUILD_DLL
+
+  Source_Files(ACE_COMPONENTS) {
+	Demux {
+      XtReactor.cpp
+    }
+  }
+}
diff --git a/bin/MakeProjectCreator/config/ace_fltk.mpb b/bin/MakeProjectCreator/config/ace_fltk.mpb
new file mode 100644
index 00000000000..40b1e07c91d
--- /dev/null
+++ b/bin/MakeProjectCreator/config/ace_fltk.mpb
@@ -0,0 +1,13 @@
+// -*- MPC -*-
+// ace_fltk.mpb,v
+
+project : ace_x11, ace_gl {
+  macros   += ACE_HAS_FL
+
+  // Depends on configration from include/makeinclude/platform_*.GNU
+  verbatim(gnuace,local) {
+    CPPFLAGS += $(PLATFORM_FL_CPPFLAGS)
+    LIBS += $(PLATFORM_FL_LIBS)
+    LDFLAGS += $(PLATFORM_FL_LDFLAGS)
+  }
+}
diff --git a/bin/MakeProjectCreator/config/ace_gl.mpb b/bin/MakeProjectCreator/config/ace_gl.mpb
new file mode 100644
index 00000000000..f9f48fd5615
--- /dev/null
+++ b/bin/MakeProjectCreator/config/ace_gl.mpb
@@ -0,0 +1,13 @@
+// -*- MPC -*-
+// ace_gl.mpb,v
+
+project : ace_x11 {
+  requires += ace_with_gl
+
+  // Depends on configration from include/makeinclude/platform_*.GNU
+  verbatim(gnuace,local) {
+    CPPFLAGS += $(PLATFORM_GL_CPPFLAGS)
+    LIBS += $(PLATFORM_GL_LIBS)
+    LDFLAGS += $(PLATFORM_GL_LDFLAGS)
+  }
+}
diff --git a/bin/MakeProjectCreator/config/ace_gtk.mpb b/bin/MakeProjectCreator/config/ace_gtk.mpb
new file mode 100644
index 00000000000..27787e115ee
--- /dev/null
+++ b/bin/MakeProjectCreator/config/ace_gtk.mpb
@@ -0,0 +1,13 @@
+// -*- MPC -*-
+// ace_gtk.mpb,v
+
+project {
+  macros   += ACE_HAS_GTK
+
+  // Depends on configration from include/makeinclude/platform_*.GNU
+  verbatim(gnuace,local) {
+    CPPFLAGS += $(PLATFORM_GTK_CPPFLAGS)
+    LIBS += $(PLATFORM_GTK_LIBS)
+    LDFLAGS += $(PLATFORM_GTK_LDFLAGS)
+  }
+}
diff --git a/bin/MakeProjectCreator/config/ace_qt.mpb b/bin/MakeProjectCreator/config/ace_qt.mpb
index 28276bc89dd..efa49a0b678 100644
--- a/bin/MakeProjectCreator/config/ace_qt.mpb
+++ b/bin/MakeProjectCreator/config/ace_qt.mpb
@@ -3,4 +3,11 @@
 
 feature(qt): qt {
   macros += ACE_HAS_QT
+
+  // Depends on configration from include/makeinclude/platform_*.GNU
+  verbatim(gnuace,local) {
+    CPPFLAGS += $(PLATFORM_QT_CPPFLAGS)
+    LIBS += $(PLATFORM_QT_LIBS)
+    LDFLAGS += $(PLATFORM_QT_LDFLAGS)
+  }
 }
diff --git a/bin/MakeProjectCreator/config/ace_qtreactor.mpb b/bin/MakeProjectCreator/config/ace_qtreactor.mpb
new file mode 100644
index 00000000000..7b74c0215ef
--- /dev/null
+++ b/bin/MakeProjectCreator/config/ace_qtreactor.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+
+project : acelib, ace_qt, qt_moc {
+  requires += qt_reactor
+  after    += ACE_QtReactor
+  libs     += ACE_QtReactor
+}
diff --git a/bin/MakeProjectCreator/config/ace_tk.mpb b/bin/MakeProjectCreator/config/ace_tk.mpb
new file mode 100644
index 00000000000..6929d50ee62
--- /dev/null
+++ b/bin/MakeProjectCreator/config/ace_tk.mpb
@@ -0,0 +1,14 @@
+// -*- MPC -*-
+// ace_tk.mpb,v
+
+project {
+  requires += ace_with_tk
+  macros   += ACE_HAS_TK
+
+  // Depends on configration from include/makeinclude/platform_*.GNU
+  verbatim(gnuace,local) {
+    CPPFLAGS += $(PLATFORM_TCL_CPPFLAGS) $(PLATFORM_TK_CPPFLAGS)
+    LIBS += $(PLATFORM_TCL_LIBS) $(PLATFORM_TK_LIBS)
+    LDFLAGS += $(PLATFORM_TCL_LIBS) $(PLATFORM_TK_LDFLAGS)
+  }
+}
diff --git a/bin/MakeProjectCreator/config/ace_x11.mpb b/bin/MakeProjectCreator/config/ace_x11.mpb
new file mode 100644
index 00000000000..38a790b8e73
--- /dev/null
+++ b/bin/MakeProjectCreator/config/ace_x11.mpb
@@ -0,0 +1,13 @@
+// -*- MPC -*-
+// ace_x11.mpb,v
+
+feature(ace_with_x11) {
+  requires += ace_with_x11
+
+  // Depends on configration from include/makeinclude/platform_*.GNU
+  verbatim(gnuace,local) {
+	CPPFLAGS += $(PLATFORM_X11_CPPFLAGS)
+	LIBS += $(PLATFORM_X11_LIBS)
+	LDFLAGS += $(PLATFORM_X11_LDFLAGS)
+  }
+}
diff --git a/bin/MakeProjectCreator/config/ace_xt.mpb b/bin/MakeProjectCreator/config/ace_xt.mpb
new file mode 100644
index 00000000000..99261a4b709
--- /dev/null
+++ b/bin/MakeProjectCreator/config/ace_xt.mpb
@@ -0,0 +1,13 @@
+// -*- MPC -*-
+// ace_xt.mpb,v
+
+project : ace_x11 {
+  macros   += ACE_HAS_XT
+
+  // Depends on configration from include/makeinclude/platform_*.GNU
+  verbatim(gnuace,local) {
+	CPPFLAGS += $(PLATFORM_XT_CPPFLAGS) $(PLATFORM_X11_CPPFLAGS)
+	LIBS += $(PLATFORM_XT_LIBS) $(PLATFORM_X11_LIBS)
+	LDFLAGS += $(PLATFORM_XT_LDFLAGS) $(PLATFORM_X11_LDFLAGS)
+  }
+}
diff --git a/bin/MakeProjectCreator/config/acedefaults.mpb b/bin/MakeProjectCreator/config/acedefaults.mpb
index fa7efd642d3..50da282fa5c 100644
--- a/bin/MakeProjectCreator/config/acedefaults.mpb
+++ b/bin/MakeProjectCreator/config/acedefaults.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: ace_qt, zzip {
+project: zzip {
   staticflags += ACE_AS_STATIC_LIBS
   includes    += $(ACE_ROOT)
   libpaths    += $(ACE_ROOT)/lib
diff --git a/bin/MakeProjectCreator/config/tao_qtreactor.mpb b/bin/MakeProjectCreator/config/tao_qtreactor.mpb
new file mode 100644
index 00000000000..424b5301d32
--- /dev/null
+++ b/bin/MakeProjectCreator/config/tao_qtreactor.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+
+project : taolib, ace_qtreactor {
+  requires += qt_reactor
+  after    += TAO_QtReactor
+  libs     += TAO_QtReactor
+}
diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU
index 27548f5aa42..71ef0089b3a 100644
--- a/include/makeinclude/platform_linux.GNU
+++ b/include/makeinclude/platform_linux.GNU
@@ -50,6 +50,14 @@ PLATFORM_BOOST_CPPFLAGS ?=
 PLATFORM_BOOST_LDLAGS ?=
 PLATFORM_BOOST_UTF_LIBS ?= -lboost_unit_test_framework
 
+PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4
+PLATFORM_TCL_LIBS=-ltcl8.4
+PLATFORM_TCL_LDFLAGS=
+
+PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS)
+PLATFORM_TK_LIBS=$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_LIB_FLAG)
+PLATFORM_TK_LDFLAGS=
+
 PLATFORM_AIO_SUPPORT := \
        $(shell test "`ls -L /usr/lib/librt.so* /lib/librt.so*`" && echo -DACE_HAS_AIO_CALLS)
 
@@ -102,7 +110,7 @@ endif
 LIBS += $(shell test "`ls -L /usr/lib/librt.so* /lib/librt.so*`" && echo -lrt)
 
 PLATFORM_QT_CPPFLAGS=-I$(QTDIR)/include
-PLATFORM_QT_LIBS=-lqt
+PLATFORM_QT_LIBS=-lqt-mt
 PLATFORM_QT_LDFLAGS=-L$(QTDIR)/lib
 
 OCFLAGS ?= -O3
diff --git a/include/makeinclude/platform_linux_borland.GNU b/include/makeinclude/platform_linux_borland.GNU
index be69dd8090c..2ff56d195b0 100644
--- a/include/makeinclude/platform_linux_borland.GNU
+++ b/include/makeinclude/platform_linux_borland.GNU
@@ -21,6 +21,14 @@ ifeq (,$(threads))
   threads = 1
 endif
 
+PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4
+PLATFORM_TCL_LIBS=-ltcl8.4
+PLATFORM_TCL_LDFLAGS=
+
+PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS)
+PLATFORM_TK_LIBS=$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_LIB_FLAG)
+PLATFORM_TK_LDFLAGS=
+
 PLATFORM_AIO_SUPPORT := \
        $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS)
 
diff --git a/include/makeinclude/platform_linux_icc.GNU b/include/makeinclude/platform_linux_icc.GNU
index df8ee77e647..907a407d34b 100644
--- a/include/makeinclude/platform_linux_icc.GNU
+++ b/include/makeinclude/platform_linux_icc.GNU
@@ -49,6 +49,14 @@ PLATFORM_WX_CPPFLAGS= $(shell wx-config --cxxflags) $(PLATFORM_GTK_CPPFLAGS)
 PLATFORM_WX_LIBS    = $(shell wx-config --libs)     $(PLATFORM_GTK_LIBS)
 PLATFORM_WX_LDFLAGS = $(shell wx-config --ldflags)  $(PLATFORM_GTK_LDFLAGS)
 
+PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4
+PLATFORM_TCL_LIBS=-ltcl8.4
+PLATFORM_TCL_LDFLAGS=
+
+PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS)
+PLATFORM_TK_LIBS=$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_LIB_FLAG)
+PLATFORM_TK_LDFLAGS=
+
 PLATFORM_AIO_SUPPORT := \
        $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS)
 
diff --git a/include/makeinclude/platform_linux_pgi.GNU b/include/makeinclude/platform_linux_pgi.GNU
index c5d63edc420..63178406929 100644
--- a/include/makeinclude/platform_linux_pgi.GNU
+++ b/include/makeinclude/platform_linux_pgi.GNU
@@ -46,6 +46,14 @@ PLATFORM_WX_CPPFLAGS= $(shell wx-config --cxxflags) $(PLATFORM_GTK_CPPFLAGS)
 PLATFORM_WX_LIBS    = $(shell wx-config --libs)     $(PLATFORM_GTK_LIBS)
 PLATFORM_WX_LDFLAGS = $(shell wx-config --ldflags)  $(PLATFORM_GTK_LDFLAGS)
 
+PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4
+PLATFORM_TCL_LIBS=-ltcl8.4
+PLATFORM_TCL_LDFLAGS=
+
+PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS)
+PLATFORM_TK_LIBS=$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_LIB_FLAG)
+PLATFORM_TK_LDFLAGS=
+
 PLATFORM_AIO_SUPPORT := \
        $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS)
 
diff --git a/include/makeinclude/platform_lynxos.GNU b/include/makeinclude/platform_lynxos.GNU
index 717c4d25b04..bb8e3341837 100644
--- a/include/makeinclude/platform_lynxos.GNU
+++ b/include/makeinclude/platform_lynxos.GNU
@@ -105,6 +105,14 @@ PLATFORM_X11_CPPFLAGS=
 PLATFORM_X11_LIBS=-lXpm -lXext -lX11 -lSM -lICE
 PLATFORM_X11_LDFLAGS=
 
+PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4
+PLATFORM_TCL_LIBS=-ltcl8.4
+PLATFORM_TCL_LDFLAGS=
+
+PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS)
+PLATFORM_TK_LIBS=$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_LIB_FLAG)
+PLATFORM_TK_LDFLAGS=
+
 pipes ?= 1
 
 CC              = gcc
diff --git a/include/makeinclude/platform_sunos5_g++.GNU b/include/makeinclude/platform_sunos5_g++.GNU
index 9e19f643a0b..c26fa32d065 100644
--- a/include/makeinclude/platform_sunos5_g++.GNU
+++ b/include/makeinclude/platform_sunos5_g++.GNU
@@ -73,6 +73,15 @@ PLATFORM_X11_CPPFLAGS= -I/usr/openwin/include -I/usr/dt/include
 PLATFORM_X11_LIBS =-lX11
 PLATFORM_X11_LDFLAGS=
 
+# TODO: Fix the parameters
+#PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4
+#PLATFORM_TCL_LIBS=-ltcl8.4
+#PLATFORM_TCL_LDFLAGS=
+#
+#PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS)
+#PLATFORM_TK_LIBS=$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_LIB_FLAG)
+#PLATFORM_TK_LDFLAGS=
+
 ## Unfortunately, gcc 3.0 fails to many cpp files with
 ## optimization enabled.  Even -O causes the compiler
 ## to core dump on some files.
diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU
index 0e32bec299c..4b532b0d3fa 100644
--- a/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -61,6 +61,10 @@ endif
 tk_reactor = 0
 ace_with_x11 = 0
 
+PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4
+PLATFORM_TCL_LIBS=-ltcl8.4
+PLATFORM_TCL_LDFLAGS=
+
 PLATFORM_TK_CPPFLAGS=
 PLATFORM_TK_LIBS=-ltk -ltcl
 PLATFORM_TK_LDFLAGS=
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index fadb71ec99f..d97f45ac5c4 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -452,9 +452,6 @@ endif # xt_reactor
 
 ifneq ($(xt_reactor),)
   override ace_with_x11=1
-  CPPFLAGS += -DACE_HAS_XT $(PLATFORM_XT_CPPFLAGS)
-  LIBS += $(PLATFORM_XT_LIBS)
-  LDFLAGS += $(PLATFORM_XT_LDFLAGS)
   ACE_MAKE_OPTIONS += xt_reactor
 endif # xt_reactor
 
@@ -466,9 +463,6 @@ endif # fl_reactor
 ifneq ($(fl_reactor),)
   override ace_with_x11=1
   override ace_with_gl=1
-  CPPFLAGS += -DACE_HAS_FL $(PLATFORM_FL_CPPFLAGS)
-  LIBS += $(PLATFORM_FL_LIBS)
-  LDFLAGS += $(PLATFORM_FL_LDFLAGS)
   ACE_MAKE_OPTIONS += rl_reactor
 endif # fl_reactor
 
@@ -479,9 +473,6 @@ endif # tk_reactor
 
 ifneq ($(tk_reactor),)
   override ace_with_tk=1
-  CPPFLAGS += -DACE_HAS_TK $(PLATFORM_TK_CPPFLAGS)
-  LIBS += $(PLATFORM_TK_LIBS)
-  LDFLAGS += $(PLATFORM_TK_LDFLAGS)
   ACE_MAKE_OPTIONS += tk_reactor
 endif # tk_reactor
 
@@ -492,9 +483,6 @@ endif # qt_reactor
 
 ifneq ($(qt_reactor),)
   override ace_with_qt=1
-  CPPFLAGS += -DACE_HAS_QT $(PLATFORM_QT_CPPFLAGS)
-  LIBS += $(PLATFORM_QT_LIBS)
-  LDFLAGS += $(PLATFORM_QT_LDFLAGS)
   ACE_MAKE_OPTIONS += qt_reactor
 endif # qt_reactor
 
@@ -550,21 +538,12 @@ endif # ace_with_gl
 
 ifneq ($(ace_with_gl),)
   override ace_with_x11 = 1
-  CPPFLAGS += $(PLATFORM_GL_CPPFLAGS)
-  LIBS += $(PLATFORM_GL_LIBS)
-  LDFLAGS += $(PLATFORM_GL_LDFLAGS)
   ACE_MAKE_OPTIONS += ace_with_gl
 endif # ace_with_gl
 
 ace_with_x11 ?=
 ifeq ($(ace_with_x11),0)
   override ace_with_x11 =
-endif # ace_with_x11
-
-ifneq ($(ace_with_x11),)
-  CPPFLAGS += $(PLATFORM_X11_CPPFLAGS)
-  LIBS += $(PLATFORM_X11_LIBS)
-  LDFLAGS += $(PLATFORM_X11_LDFLAGS)
   ACE_MAKE_OPTIONS += ace_with_x11
 endif # ace_with_x11
 
diff --git a/tests/tests.mpc b/tests/tests.mpc
index f904eadd4e4..048e069a377 100644
--- a/tests/tests.mpc
+++ b/tests/tests.mpc
@@ -1138,7 +1138,7 @@ project(SOCK_SEQPACK_SCTP_Test) : acetest {
   }
 }
 
-project(QtReactor Test) : acetest, ace_qt, qt_moc {
+project(QtReactor Test) : acetest, ace_qtreactor {
   exename   = QtReactor_Test
   requires += qt
   MOC_Files {