diff options
| author | Steve Huston <shuston@riverace.com> | 2002-10-16 16:47:36 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2002-10-16 16:47:36 +0000 |
| commit | 974f3c1f53d2f12ac39afd37bd243b22be762cef (patch) | |
| tree | 0688fc24979e4e997fb3bbb0bb7fd1f5a7897589 /examples | |
| parent | dfe500e34128b15f00dbd1006fb76f42aa0f9d82 (diff) | |
| download | ATCD-974f3c1f53d2f12ac39afd37bd243b22be762cef.tar.gz | |
ChangeLogTag:Wed Oct 16 12:41:29 2002 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/C++NPv2/Makefile | 8 | ||||
| -rw-r--r-- | examples/C++NPv2/Makefile.AC_CLD | 11 | ||||
| -rw-r--r-- | examples/C++NPv2/Makefile.AIO_CLD | 13 | ||||
| -rw-r--r-- | examples/C++NPv2/Makefile.TPCLS | 11 | ||||
| -rw-r--r-- | examples/Makefile | 2 |
5 files changed, 38 insertions, 7 deletions
diff --git a/examples/C++NPv2/Makefile b/examples/C++NPv2/Makefile index 8d7056175b7..09a5dd6b41a 100644 --- a/examples/C++NPv2/Makefile +++ b/examples/C++NPv2/Makefile @@ -9,6 +9,7 @@ # Local macros #---------------------------------------------------------------------------- +# These examples don't require SSL support... those that do are below. EXAMPLES = Reactor_Logging_Server \ Select_Reactor_Logging_Server \ TP_Reactor_Logging_Server \ @@ -17,12 +18,13 @@ EXAMPLES = Reactor_Logging_Server \ SLDex \ CLD \ TPLS \ - TPCLS \ SR_Configurable_Logging_Server \ - AC_CLD \ - AIO_CLD \ display_logfile +ifneq ($(ssl),) + EXAMPLES += AC_CLD AIO_CLD TPCLS +endif # ssl + all: @for ex in $(EXAMPLES); \ do \ diff --git a/examples/C++NPv2/Makefile.AC_CLD b/examples/C++NPv2/Makefile.AC_CLD index 96bb07647e4..fc5972e00a1 100644 --- a/examples/C++NPv2/Makefile.AC_CLD +++ b/examples/C++NPv2/Makefile.AC_CLD @@ -9,7 +9,10 @@ #---------------------------------------------------------------------------- # This example uses SSL. -ssl=1 +ifeq ($(ssl),) +default: + @echo 'This example requires SSL; build with make ssl=1' +endif #ssl SHLIB = libAC_CLD.$(SOEXT) FILES = AC_Client_Logging_Daemon \ @@ -37,3 +40,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU ifdef TEMPINCDIR COMPILE.cc := $(RM) -rf tempinc; $(COMPILE.cc) endif + +ifneq ($(ssl),) + CPPFLAGS += $(PLATFORM_SSL_CPPFLAGS) + LIBS += $(PLATFORM_SSL_LIBS) + LDFLAGS += $(PLATFORM_SSL_LDFLAGS) +endif # ssl diff --git a/examples/C++NPv2/Makefile.AIO_CLD b/examples/C++NPv2/Makefile.AIO_CLD index 7c20491dc93..fe7c522a6ec 100644 --- a/examples/C++NPv2/Makefile.AIO_CLD +++ b/examples/C++NPv2/Makefile.AIO_CLD @@ -8,8 +8,11 @@ # Local macros #---------------------------------------------------------------------------- -# This code uses SSL. -ssl=1 +# This example uses SSL. +ifeq ($(ssl),) +default: + @echo 'This example requires SSL; build with make ssl=1' +endif #ssl SHLIB = libAIO_CLD.$(SOEXT) FILES = AIO_Client_Logging_Daemon @@ -36,3 +39,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU ifdef TEMPINCDIR COMPILE.cc := $(RM) -rf tempinc; $(COMPILE.cc) endif + +ifneq ($(ssl),) + CPPFLAGS += $(PLATFORM_SSL_CPPFLAGS) + LIBS += $(PLATFORM_SSL_LIBS) + LDFLAGS += $(PLATFORM_SSL_LDFLAGS) +endif # ssl diff --git a/examples/C++NPv2/Makefile.TPCLS b/examples/C++NPv2/Makefile.TPCLS index f957c399065..df7878b89fd 100644 --- a/examples/C++NPv2/Makefile.TPCLS +++ b/examples/C++NPv2/Makefile.TPCLS @@ -9,7 +9,10 @@ #---------------------------------------------------------------------------- # This example uses SSL. -ssl=1 +ifeq ($(ssl),) +default: + @echo 'This example requires SSL; build with make ssl=1' +endif #ssl SHLIB = libTPCLS.$(SOEXT) FILES = TPC_Logging_Server \ @@ -37,3 +40,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU ifdef TEMPINCDIR COMPILE.cc := $(RM) -rf tempinc; $(COMPILE.cc) endif + +ifneq ($(ssl),) + CPPFLAGS += $(PLATFORM_SSL_CPPFLAGS) + LIBS += $(PLATFORM_SSL_LIBS) + LDFLAGS += $(PLATFORM_SSL_LDFLAGS) +endif # ssl diff --git a/examples/Makefile b/examples/Makefile index a0d1af6f204..f552b5dc749 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -11,6 +11,8 @@ INFO = README DIRS = ASX \ + C++NPv1 \ + C++NPv2 \ Connection \ IPC_SAP \ IOStream \ |