2 files changed, 8 insertions, 14 deletions
diff --git a/TAO/performance-tests/POA/Demux/Makefile.am b/TAO/performance-tests/POA/Demux/Makefile.am
index 830f99e3258..225509c280e 100644
--- a/TAO/performance-tests/POA/Demux/Makefile.am
+++ b/TAO/performance-tests/POA/Demux/Makefile.am
@@ -16,7 +16,6 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
 
 ## Makefile.Demux_Poa_Idl.am
 
@@ -50,9 +49,9 @@ noinst_HEADERS = \
 
 if BUILD_EXCEPTIONS
 
-noinst_PROGRAMS += client
+noinst_LTLIBRARIES = libDemux_Poa_Client.la
 
-client_CPPFLAGS = \
+libDemux_Poa_Client_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
@@ -60,28 +59,23 @@ client_CPPFLAGS = \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs
 
-client_SOURCES = \
+libDemux_Poa_Client_la_SOURCES = \
   client.cpp \
   demux_testC.cpp \
   demux_testS.cpp \
-  demux_test_client.cpp \
+  demux_test_client.cpp
+
+noinst_HEADERS += \
   demux_test_client.h \
   demux_test_client.inl
 
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
 endif BUILD_EXCEPTIONS
 
 ## Makefile.Demux_Poa_Server.am
 
 if BUILD_EXCEPTIONS
 
-noinst_PROGRAMS += server
+noinst_PROGRAMS = server
 
 server_CPPFLAGS = \
   -I$(ACE_ROOT) \
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am
index 4f7f009ed7b..df75e2e6f79 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am
@@ -41,7 +41,7 @@ CLEANFILES = \
 testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
 
 test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
 	@touch $@
 
 noinst_PROGRAMS = registration