From 4dec1607ce647ac5b6380fa62fd1efdd16c630ba Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Thu, 20 Mar 2014 20:34:10 +0000 Subject: [PATCH] Revert "Cleanup whitespace" Too much was staged accidentally on that last commit. This reverts commit f1126272424483efd6d8db7741dfc9949492e026. --- src/mod/event_handlers/mod_event_zmq/Makefile.am | 3 ++- src/mod/languages/mod_spidermonkey/Makefile.am | 4 ++-- src/mod/languages/mod_v8/Makefile.am | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mod/event_handlers/mod_event_zmq/Makefile.am b/src/mod/event_handlers/mod_event_zmq/Makefile.am index 1b171a69c0..5ebc116f0f 100644 --- a/src/mod/event_handlers/mod_event_zmq/Makefile.am +++ b/src/mod/event_handlers/mod_event_zmq/Makefile.am @@ -12,7 +12,7 @@ ZMQ_LA=$(ZMQ_BUILDDIR)/src/libzmq.la mod_LTLIBRARIES = mod_event_zmq.la mod_event_zmq_la_SOURCES = mod_event_zmq.cpp mod_event_zmq_la_CFLAGS = $(AM_CFLAGS) -mod_event_zmq_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(ZMQ_DIR)/include -I$(switch_srcdir)/libs/libteletone/src/ +mod_event_zmq_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(ZMQ_DIR)/include -I$(switch_srcdir)/libs/libteletone/src/ mod_event_zmq_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(ZMQ_LA) mod_event_zmq_la_LDFLAGS = -avoid-version -module -no-undefined -shared @@ -32,3 +32,4 @@ $(ZMQ_BUILDDIR)/Makefile: $(ZMQ_DIR) $(ZMQ_LA): $(ZMQ_BUILDDIR)/Makefile cd $(ZMQ_BUILDDIR) && $(MAKE) $(TOUCH_TARGET) + diff --git a/src/mod/languages/mod_spidermonkey/Makefile.am b/src/mod/languages/mod_spidermonkey/Makefile.am index e93d4a084e..bb716ee9de 100644 --- a/src/mod/languages/mod_spidermonkey/Makefile.am +++ b/src/mod/languages/mod_spidermonkey/Makefile.am @@ -21,13 +21,13 @@ mod_LTLIBRARIES = mod_spidermonkey.la mod_spidermonkey_la_SOURCES = mod_spidermonkey.c mod_spidermonkey_la_CFLAGS = $(AM_CFLAGS) $(LIBCURL_CPPFLAGS) mod_spidermonkey_la_LIBADD = $(AM_LIBADD) -mod_spidermonkey_la_LDFLAGS = $(LIBCURL) $(AM_LDFLAGS) +mod_spidermonkey_la_LDFLAGS = $(AM_LDFLAGS) $(LIBCURL) mod_LTLIBRARIES += mod_spidermonkey_curl.la mod_spidermonkey_curl_la_SOURCES = mod_spidermonkey_curl.c mod_spidermonkey_curl_la_CFLAGS = $(AM_CFLAGS) $(LIBCURL_CPPFLAGS) mod_spidermonkey_curl_la_LIBADD = $(AM_LIBADD) -mod_spidermonkey_curl_la_LDFLAGS = $(LIBCURL) $(AM_LDFLAGS) +mod_spidermonkey_curl_la_LDFLAGS = $(AM_LDFLAGS) $(LIBCURL) mod_LTLIBRARIES += mod_spidermonkey_socket.la mod_spidermonkey_socket_la_SOURCES = mod_spidermonkey_socket.c diff --git a/src/mod/languages/mod_v8/Makefile.am b/src/mod/languages/mod_v8/Makefile.am index 4836075337..88dbe88c2f 100644 --- a/src/mod/languages/mod_v8/Makefile.am +++ b/src/mod/languages/mod_v8/Makefile.am @@ -96,7 +96,7 @@ mod_v8_la_SOURCES = \ mod_v8_la_CFLAGS = $(AM_CFLAGS) $(LIBCURL_CPPFLAGS) -I$(switch_srcdir)/libs/libteletone/src mod_v8_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBCURL_CPPFLAGS) -I$(switch_srcdir)/libs/libteletone/src mod_v8_la_LIBADD = $(AM_LIBADD) -mod_v8_la_LDFLAGS = $(LIBCURL) $(V8_LDFLAGS) $(AM_LDFLAGS) +mod_v8_la_LDFLAGS = $(AM_LDFLAGS) $(LIBCURL) $(V8_LDFLAGS) #mod_LTLIBRARIES += mod_v8_skel.la #mod_v8_skel_la_SOURCES = mod_v8_skel.cpp