summaryrefslogtreecommitdiff
path: root/TAO/interop-tests
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-12-23 00:12:56 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-12-23 00:12:56 +0000
commit1f22e3d4a9725f0c53ec01bbe903de77a8f584c6 (patch)
tree748c01d970eccb6efc3d5e738e6f8ec828827e71 /TAO/interop-tests
parent8cc64708bc557b892733d16ca2531c382adb2108 (diff)
downloadATCD-1f22e3d4a9725f0c53ec01bbe903de77a8f584c6.tar.gz
ChangeLogTag: Thu Dec 22 16:07:11 2005 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/interop-tests')
-rw-r--r--TAO/interop-tests/wchar/Makefile.am40
1 files changed, 20 insertions, 20 deletions
diff --git a/TAO/interop-tests/wchar/Makefile.am b/TAO/interop-tests/wchar/Makefile.am
index 0a382f2f055..b7ead6db9a4 100644
--- a/TAO/interop-tests/wchar/Makefile.am
+++ b/TAO/interop-tests/wchar/Makefile.am
@@ -16,12 +16,13 @@ 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)
-## Makefile.Interop_Wchar_Client.am
+## Makefile.Interop_Wchar_Server.am
BUILT_SOURCES = \
interop_wcharC.cpp \
interop_wcharC.h \
interop_wcharC.inl \
+ interop_wcharS.cpp \
interop_wcharS.h \
interop_wcharS.inl \
interop_wcharS_T.cpp \
@@ -33,49 +34,53 @@ CLEANFILES = \
interop_wcharC.cpp \
interop_wcharC.h \
interop_wcharC.inl \
+ interop_wcharS.cpp \
interop_wcharS.h \
interop_wcharS.inl \
interop_wcharS_T.cpp \
interop_wcharS_T.h \
interop_wcharS_T.inl
-interop_wcharC.cpp interop_wcharC.h interop_wcharC.inl interop_wcharS.h interop_wcharS.inl interop_wcharS_T.cpp interop_wcharS_T.h interop_wcharS_T.inl: interop_wchar-stamp
+interop_wcharC.cpp interop_wcharC.h interop_wcharC.inl interop_wcharS.cpp interop_wcharS.h interop_wcharS.inl interop_wcharS_T.cpp interop_wcharS_T.h interop_wcharS_T.inl: interop_wchar-stamp
interop_wchar-stamp: $(srcdir)/interop_wchar.idl $(TAO_IDL_DEP)
$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/interop_wchar.idl
@touch $@
-noinst_PROGRAMS = client
+noinst_PROGRAMS = server
-client_CPPFLAGS = \
+server_CPPFLAGS = \
-I$(ACE_ROOT) \
-I$(ACE_BUILDDIR) \
-I$(TAO_ROOT) \
-I$(TAO_BUILDDIR)
-client_SOURCES = \
- client.cpp \
+server_SOURCES = \
interop_wcharC.cpp \
+ interop_wcharS.cpp \
+ interop_wchar_i.cpp \
+ server.cpp \
wchar_reference.cpp \
interop_wcharC.h \
interop_wcharC.inl \
interop_wcharS.h \
interop_wcharS_T.h \
interop_wcharS_T.inl \
+ interop_wchar_i.h \
wchar_reference.h
-client_LDADD = \
+server_LDADD = \
+ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
$(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la
-## Makefile.Interop_Wchar_Server.am
+## Makefile.Interop_Wchar_Client.am
BUILT_SOURCES += \
interop_wcharC.cpp \
interop_wcharC.h \
interop_wcharC.inl \
- interop_wcharS.cpp \
interop_wcharS.h \
interop_wcharS.inl \
interop_wcharS_T.cpp \
@@ -87,43 +92,38 @@ CLEANFILES += \
interop_wcharC.cpp \
interop_wcharC.h \
interop_wcharC.inl \
- interop_wcharS.cpp \
interop_wcharS.h \
interop_wcharS.inl \
interop_wcharS_T.cpp \
interop_wcharS_T.h \
interop_wcharS_T.inl
-interop_wcharC.cpp interop_wcharC.h interop_wcharC.inl interop_wcharS.cpp interop_wcharS.h interop_wcharS.inl interop_wcharS_T.cpp interop_wcharS_T.h interop_wcharS_T.inl: interop_wchar-stamp
+interop_wcharC.cpp interop_wcharC.h interop_wcharC.inl interop_wcharS.h interop_wcharS.inl interop_wcharS_T.cpp interop_wcharS_T.h interop_wcharS_T.inl: interop_wchar-stamp
interop_wchar-stamp: $(srcdir)/interop_wchar.idl $(TAO_IDL_DEP)
$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/interop_wchar.idl
@touch $@
-noinst_PROGRAMS += server
+noinst_PROGRAMS += client
-server_CPPFLAGS = \
+client_CPPFLAGS = \
-I$(ACE_ROOT) \
-I$(ACE_BUILDDIR) \
-I$(TAO_ROOT) \
-I$(TAO_BUILDDIR)
-server_SOURCES = \
+client_SOURCES = \
+ client.cpp \
interop_wcharC.cpp \
- interop_wcharS.cpp \
- interop_wchar_i.cpp \
- server.cpp \
wchar_reference.cpp \
interop_wcharC.h \
interop_wcharC.inl \
interop_wcharS.h \
interop_wcharS_T.h \
interop_wcharS_T.inl \
- interop_wchar_i.h \
wchar_reference.h
-server_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+client_LDADD = \
$(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
$(TAO_BUILDDIR)/tao/libTAO.la \
$(ACE_BUILDDIR)/ace/libACE.la