diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-12-31 23:15:17 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-12-31 23:15:17 +0000 |
| commit | 166431be1bcecd67869b583c01351f58931579dc (patch) | |
| tree | 5454212fe24322f49921fddc560c8d883c29c76c /TAO/orbsvcs/ImplRepo_Service/Makefile.am | |
| parent | cf2489eb2d2b6ddfd61d675e06d4c3334d53e848 (diff) | |
| download | ATCD-166431be1bcecd67869b583c01351f58931579dc.tar.gz | |
ChangeLogTag: Sun Dec 31 23:12:36 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/orbsvcs/ImplRepo_Service/Makefile.am')
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Makefile.am | 54 |
1 files changed, 44 insertions, 10 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile.am b/TAO/orbsvcs/ImplRepo_Service/Makefile.am index f35c840e283..146e1a134c8 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Makefile.am +++ b/TAO/orbsvcs/ImplRepo_Service/Makefile.am @@ -177,11 +177,15 @@ libTAO_ImR_Activator_la_CPPFLAGS = \ -I$(ACE_ROOT)/ACEXML/common \ -DACTIVATOR_BUILD_DLL +if BUILD_ZLIB if BUILD_ZZIP libTAO_ImR_Activator_la_CPPFLAGS += \ -I$(ZZIP_ROOT)/include \ - -DUSE_ZZIP + -I$(ZLIB_ROOT)/include \ + -DUSE_ZZIP \ + -DZLIB endif BUILD_ZZIP +endif BUILD_ZLIB libTAO_ImR_Activator_la_SOURCES = \ Activator_Loader.cpp \ @@ -190,10 +194,13 @@ libTAO_ImR_Activator_la_SOURCES = \ libTAO_ImR_Activator_la_LDFLAGS = +if BUILD_ZLIB if BUILD_ZZIP libTAO_ImR_Activator_la_LDFLAGS += \ - -L$(ZZIP_ROOT)/lib + -L$(ZZIP_ROOT)/lib \ + -L$(ZLIB_ROOT)/lib endif BUILD_ZZIP +endif BUILD_ZLIB noinst_HEADERS += \ Activator_Loader.h \ @@ -224,11 +231,15 @@ ImR_Activator_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs +if BUILD_ZLIB if BUILD_ZZIP ImR_Activator_CPPFLAGS += \ -I$(ZZIP_ROOT)/include \ - -DUSE_ZZIP + -I$(ZLIB_ROOT)/include \ + -DUSE_ZZIP \ + -DZLIB endif BUILD_ZZIP +endif BUILD_ZLIB ImR_Activator_SOURCES = \ Activator_NT_Service.cpp \ @@ -237,10 +248,13 @@ ImR_Activator_SOURCES = \ ImR_Activator_LDFLAGS = +if BUILD_ZLIB if BUILD_ZZIP ImR_Activator_LDFLAGS += \ - -L$(ZZIP_ROOT)/lib + -L$(ZZIP_ROOT)/lib \ + -L$(ZLIB_ROOT)/lib endif BUILD_ZZIP +endif BUILD_ZLIB ImR_Activator_LDADD = \ libTAO_ImR_Activator.la \ @@ -259,10 +273,13 @@ ImR_Activator_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +if BUILD_ZLIB if BUILD_ZZIP ImR_Activator_LDADD += \ - -lzzip + -lzzip \ + -lz endif BUILD_ZZIP +endif BUILD_ZLIB endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS @@ -288,11 +305,15 @@ libTAO_ImR_Locator_la_CPPFLAGS = \ -I$(ACE_ROOT)/ACEXML/common \ -DLOCATOR_BUILD_DLL +if BUILD_ZLIB if BUILD_ZZIP libTAO_ImR_Locator_la_CPPFLAGS += \ -I$(ZZIP_ROOT)/include \ - -DUSE_ZZIP + -I$(ZLIB_ROOT)/include \ + -DUSE_ZZIP \ + -DZLIB endif BUILD_ZZIP +endif BUILD_ZLIB libTAO_ImR_Locator_la_SOURCES = \ Activator_Info.cpp \ @@ -310,10 +331,13 @@ libTAO_ImR_Locator_la_SOURCES = \ libTAO_ImR_Locator_la_LDFLAGS = +if BUILD_ZLIB if BUILD_ZZIP libTAO_ImR_Locator_la_LDFLAGS += \ - -L$(ZZIP_ROOT)/lib + -L$(ZZIP_ROOT)/lib \ + -L$(ZLIB_ROOT)/lib endif BUILD_ZZIP +endif BUILD_ZLIB noinst_HEADERS += \ Activator_Info.h \ @@ -354,11 +378,15 @@ ImplRepo_Service_CPPFLAGS = \ -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_BUILDDIR)/orbsvcs +if BUILD_ZLIB if BUILD_ZZIP ImplRepo_Service_CPPFLAGS += \ -I$(ZZIP_ROOT)/include \ - -DUSE_ZZIP + -I$(ZLIB_ROOT)/include \ + -DUSE_ZZIP \ + -DZLIB endif BUILD_ZZIP +endif BUILD_ZLIB ImplRepo_Service_SOURCES = \ ImR_Locator.cpp \ @@ -367,10 +395,13 @@ ImplRepo_Service_SOURCES = \ ImplRepo_Service_LDFLAGS = +if BUILD_ZLIB if BUILD_ZZIP ImplRepo_Service_LDFLAGS += \ - -L$(ZZIP_ROOT)/lib + -L$(ZZIP_ROOT)/lib \ + -L$(ZLIB_ROOT)/lib endif BUILD_ZZIP +endif BUILD_ZLIB ImplRepo_Service_LDADD = \ libTAO_ImR_Locator.la \ @@ -391,10 +422,13 @@ ImplRepo_Service_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +if BUILD_ZLIB if BUILD_ZZIP ImplRepo_Service_LDADD += \ - -lzzip + -lzzip \ + -lz endif BUILD_ZZIP +endif BUILD_ZLIB endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS |