diff options
Diffstat (limited to 'TAO/orbsvcs')
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Makefile.am | 54 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.am | 16 |
2 files changed, 57 insertions, 13 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 diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index 8acb66bff79..313787799e0 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -2374,11 +2374,15 @@ libTAO_CosNotification_Persist_la_CPPFLAGS = \ -DTAO_HAS_TYPED_EVENT_CHANNEL \ -DTAO_NOTIFY_PERSIST_BUILD_DLL +if BUILD_ZLIB if BUILD_ZZIP libTAO_CosNotification_Persist_la_CPPFLAGS += \ -I$(ZZIP_ROOT)/include \ - -DUSE_ZZIP + -I$(ZLIB_ROOT)/include \ + -DUSE_ZZIP \ + -DZLIB endif BUILD_ZZIP +endif BUILD_ZLIB libTAO_CosNotification_Persist_la_SOURCES = \ Notify/XML_Loader.cpp \ @@ -2388,10 +2392,13 @@ libTAO_CosNotification_Persist_la_SOURCES = \ libTAO_CosNotification_Persist_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ +if BUILD_ZLIB if BUILD_ZZIP libTAO_CosNotification_Persist_la_LDFLAGS += \ - -L$(ZZIP_ROOT)/lib + -L$(ZZIP_ROOT)/lib \ + -L$(ZLIB_ROOT)/lib endif BUILD_ZZIP +endif BUILD_ZLIB libTAO_CosNotification_Persist_la_LIBADD = \ $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \ @@ -2410,10 +2417,13 @@ libTAO_CosNotification_Persist_la_LIBADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +if BUILD_ZLIB if BUILD_ZZIP libTAO_CosNotification_Persist_la_LIBADD += \ - -lzzip + -lzzip \ + -lz endif BUILD_ZZIP +endif BUILD_ZLIB nobase_include_HEADERS += \ Notify/XML_Loader.h \ |