From 5ed15f55556244d9f522ac06e7e127866e7f032b Mon Sep 17 00:00:00 2001 From: Andrew Thompson Date: Wed, 17 Jun 2009 20:39:08 +0000 Subject: [PATCH] put OPENSSL_CFLAGS and LIBS in modmake.rules.in at MikeJ's suggestion git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13820 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- build/modmake.rules.in | 3 +++ configure.in | 1 - src/mod/event_handlers/mod_event_multicast/Makefile | 5 +++++ src/mod/event_handlers/mod_event_multicast/Makefile.in | 5 ----- 4 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 src/mod/event_handlers/mod_event_multicast/Makefile delete mode 100644 src/mod/event_handlers/mod_event_multicast/Makefile.in diff --git a/build/modmake.rules.in b/build/modmake.rules.in index 5b72e285da..dc1e64fecf 100644 --- a/build/modmake.rules.in +++ b/build/modmake.rules.in @@ -21,6 +21,9 @@ LIBCURL_CPPFLAGS=@LIBCURL_CPPFLAGS@ CURL_DIR=$(switch_srcdir)/libs/curl CURLLA=$(CURL_DIR)/lib/libcurl.la +OPENSSL_LIBS=@openssl_LIBS@ +OPENSSL_CFLAGS=@openssl_CFLAGS@ + LIBS=$(switch_builddir)/libfreeswitch.la DEFS=@DEFS@ PREFIX = @prefix@ diff --git a/configure.in b/configure.in index c729f5669c..c4fa96805a 100644 --- a/configure.in +++ b/configure.in @@ -751,7 +751,6 @@ AC_CONFIG_FILES([Makefile src/mod/languages/mod_java/Makefile src/mod/languages/mod_python/Makefile src/mod/event_handlers/mod_erlang_event/Makefile - src/mod/event_handlers/mod_event_multicast/Makefile src/include/switch_am_config.h build/getsounds.sh build/getlib.sh diff --git a/src/mod/event_handlers/mod_event_multicast/Makefile b/src/mod/event_handlers/mod_event_multicast/Makefile new file mode 100644 index 0000000000..2251807356 --- /dev/null +++ b/src/mod/event_handlers/mod_event_multicast/Makefile @@ -0,0 +1,5 @@ + +LOCAL_CFLAGS= $(openssl_CFLAGS) +LOCAL_LDLAGS= $(openssl_LIBS) + +include ../../../../build/modmake.rules diff --git a/src/mod/event_handlers/mod_event_multicast/Makefile.in b/src/mod/event_handlers/mod_event_multicast/Makefile.in deleted file mode 100644 index 2b920243c3..0000000000 --- a/src/mod/event_handlers/mod_event_multicast/Makefile.in +++ /dev/null @@ -1,5 +0,0 @@ - -LOCAL_CFLAGS= @openssl_CFLAGS@ -LOCAL_LDLAGS= @openssl_LIBS@ - -include ../../../../build/modmake.rules