diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-05-09 18:37:19 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-05-09 18:37:19 +0000 |
| commit | 588a3fba9b83388465b418ceb9145cab346b118c (patch) | |
| tree | ce4b9a94ea4bf41db97b33df351e606266ef1cc3 /TAO/tao/ETCL | |
| parent | 88a02eacea34dcf7adfd20dee5b8c4a198c854c8 (diff) | |
| download | ATCD-588a3fba9b83388465b418ceb9145cab346b118c.tar.gz | |
ChangeLogTag: Fri May 9 18:26:24 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/tao/ETCL')
| -rw-r--r-- | TAO/tao/ETCL/Makefile.am | 44 |
1 files changed, 1 insertions, 43 deletions
diff --git a/TAO/tao/ETCL/Makefile.am b/TAO/tao/ETCL/Makefile.am index cca6aba6173..71396575b51 100644 --- a/TAO/tao/ETCL/Makefile.am +++ b/TAO/tao/ETCL/Makefile.am @@ -16,13 +16,12 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_ROOT = $(top_srcdir) -lib_LTLIBRARIES = ## Makefile.TAO_ETCL.am if BUILD_EXCEPTIONS -lib_LTLIBRARIES += libTAO_ETCL.la +lib_LTLIBRARIES = libTAO_ETCL.la libTAO_ETCL_la_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -39,8 +38,6 @@ libTAO_ETCL_la_LDFLAGS = \ libTAO_ETCL_la_LIBADD = \ $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -65,45 +62,6 @@ EXTRA_DIST = \ TAO_ETCL.pc.in -## Makefile.TAO_ETCL_Parser.am - -if BUILD_EXCEPTIONS - -lib_LTLIBRARIES += libTAO_ETCL_Parser.la - -libTAO_ETCL_Parser_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(ACE_ROOT)/ETCL \ - -I$(TAO_ROOT)/tao/ETCL/ETCL_include \ - -DTAO_ETCL_PARSER_BUILD_DLL - -libTAO_ETCL_Parser_la_SOURCES = \ - ETCL_Interpreter.cpp \ - ETCL_l.cpp \ - ETCL_y.cpp - -libTAO_ETCL_Parser_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_ETCL_Parser_la_LIBADD = \ - libTAO_ETCL.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - $(ACE_ROOT)/ace/ETCL/ETCL_Interpreter.h \ - $(ACE_ROOT)/ace/ETCL/ETCL_y.h \ - $(TAO_ROOT)/tao/ETCL/ETCL_include/ETCL_include.h \ - $(TAO_ROOT)/tao/ETCL/ETCL_include/ETCL_macros.h \ - $(TAO_ROOT)/tao/ETCL/ETCL_include/etcl_parser_export.h \ - TAO_ETCL_Constraint.inl - -endif BUILD_EXCEPTIONS - ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* |