1 files changed, 49 insertions, 17 deletions
diff --git a/TAO/examples/POA/DSI/Makefile.am b/TAO/examples/POA/DSI/Makefile.am
index b07c62eb17b..b5e40f2c807 100644
--- a/TAO/examples/POA/DSI/Makefile.am
+++ b/TAO/examples/POA/DSI/Makefile.am
@@ -16,48 +16,42 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -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)
 
+CLEANFILES =
 noinst_PROGRAMS =
+BUILT_SOURCES =
 
-## Makefile.POA_DSI_IDL.am
+## Makefile.POA_DSI_Client.am
+
+if BUILD_CORBA_MESSAGING
+if !BUILD_MINIMUM_CORBA
 
-BUILT_SOURCES = \
+BUILT_SOURCES += \
   DatabaseC.cpp \
   DatabaseC.h \
   DatabaseC.inl \
-  DatabaseS.cpp \
   DatabaseS.h \
   DatabaseS.inl \
   DatabaseS_T.cpp \
   DatabaseS_T.h \
   DatabaseS_T.inl
 
-CLEANFILES = \
+CLEANFILES += \
   Database-stamp \
   DatabaseC.cpp \
   DatabaseC.h \
   DatabaseC.inl \
-  DatabaseS.cpp \
   DatabaseS.h \
   DatabaseS.inl \
   DatabaseS_T.cpp \
   DatabaseS_T.h \
   DatabaseS_T.inl
 
-DatabaseC.cpp DatabaseC.h DatabaseC.inl DatabaseS.cpp DatabaseS.h DatabaseS.inl DatabaseS_T.cpp DatabaseS_T.h DatabaseS_T.inl: Database-stamp
+DatabaseC.cpp DatabaseC.h DatabaseC.inl DatabaseS.h DatabaseS.inl DatabaseS_T.cpp DatabaseS_T.h DatabaseS_T.inl: Database-stamp
 
 Database-stamp: $(srcdir)/Database.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Database.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Database.idl
 	@touch $@
 
-
-noinst_HEADERS = \
-  Database.idl
-
-## Makefile.POA_DSI_Client.am
-
-if BUILD_CORBA_MESSAGING
-if !BUILD_MINIMUM_CORBA
-
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -69,7 +63,11 @@ client_CPPFLAGS = \
 client_SOURCES = \
   DatabaseC.cpp \
   client.cpp \
-  Database_i.h
+  DatabaseC.h \
+  DatabaseC.inl \
+  DatabaseS.h \
+  DatabaseS_T.h \
+  DatabaseS_T.inl
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -89,6 +87,35 @@ endif BUILD_CORBA_MESSAGING
 if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
+BUILT_SOURCES += \
+  DatabaseC.cpp \
+  DatabaseC.h \
+  DatabaseC.inl \
+  DatabaseS.cpp \
+  DatabaseS.h \
+  DatabaseS.inl \
+  DatabaseS_T.cpp \
+  DatabaseS_T.h \
+  DatabaseS_T.inl
+
+CLEANFILES += \
+  Database-stamp \
+  DatabaseC.cpp \
+  DatabaseC.h \
+  DatabaseC.inl \
+  DatabaseS.cpp \
+  DatabaseS.h \
+  DatabaseS.inl \
+  DatabaseS_T.cpp \
+  DatabaseS_T.h \
+  DatabaseS_T.inl
+
+DatabaseC.cpp DatabaseC.h DatabaseC.inl DatabaseS.cpp DatabaseS.h DatabaseS.inl DatabaseS_T.cpp DatabaseS_T.h DatabaseS_T.inl: Database-stamp
+
+Database-stamp: $(srcdir)/Database.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Database.idl
+	@touch $@
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -102,6 +129,11 @@ server_SOURCES = \
   DatabaseS.cpp \
   Database_i.cpp \
   server.cpp \
+  DatabaseC.h \
+  DatabaseC.inl \
+  DatabaseS.h \
+  DatabaseS_T.h \
+  DatabaseS_T.inl \
   Database_i.h
 
 server_LDADD = \