From cf8c08c980f11c2bff08dae68dd1b049f8508691 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Fri, 11 Apr 2008 17:32:20 +0000
Subject: [PATCH] * src/Makefile.in: Improved indentation of GCC call *
src/ejabberd_zlib/Makefile.in: Likewise * src/mod_irc/Makefile.in: Likewise *
src/stringprep/Makefile.in: Likewise * src/tls/Makefile.in: Likewise
SVN Revision: 1291
---
ChangeLog | 6 ++++++
src/Makefile.in | 13 ++++++++-----
src/ejabberd_zlib/Makefile.in | 14 +++++++++-----
src/mod_irc/Makefile.in | 11 +++++++----
src/stringprep/Makefile.in | 10 ++++++----
src/tls/Makefile.in | 14 +++++++++-----
6 files changed, 45 insertions(+), 23 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ff4a32ab6..b02212b95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-04-11 Badlop <badlop@process-one.net>
+ * src/Makefile.in: Improved indentation of GCC call
+ * src/ejabberd_zlib/Makefile.in: Likewise
+ * src/mod_irc/Makefile.in: Likewise
+ * src/stringprep/Makefile.in: Likewise
+ * src/tls/Makefile.in: Likewise
+
* src/ejabberd_listener.erl (start_listener): Revert SVN r1260.
2008-04-11 Alexey Shchepin <alexey@process-one.net>
diff --git a/src/Makefile.in b/src/Makefile.in
index fa864b83a..57bb56333 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -102,11 +102,14 @@ mostlyclean-recursive maintainer-clean-recursive:
@ERLC@ -W $(ERLC_FLAGS) $*.erl
$(ERLSHLIBS): %.so: %.c
- $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) \
- $(subst ../,,$(subst .so,.c,$@)) \
- $(EXPAT_LIBS) $(EXPAT_CFLAGS) \
- $(ERLANG_LIBS) $(ERLANG_CFLAGS) \
- -o $@ $(DYNAMIC_LIB_CFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) \
+ $(subst ../,,$(subst .so,.c,$@)) \
+ $(EXPAT_LIBS) \
+ $(EXPAT_CFLAGS) \
+ $(ERLANG_LIBS) \
+ $(ERLANG_CFLAGS) \
+ -o $@ \
+ $(DYNAMIC_LIB_CFLAGS)
install: all
install -d $(BEAMDIR)
diff --git a/src/ejabberd_zlib/Makefile.in b/src/ejabberd_zlib/Makefile.in
index a40c37d6f..f24addbc3 100644
--- a/src/ejabberd_zlib/Makefile.in
+++ b/src/ejabberd_zlib/Makefile.in
@@ -39,11 +39,15 @@ $(OUTDIR)/%.beam: %.erl
# erl -s make all report "{outdir, \"..\"}" -noinput -s erlang halt
$(ERLSHLIBS): ../%.so: %.c
- $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
- $(subst ../,,$(subst .so,.c,$@)) $(LIBS) \
- $(ZLIB_LIBS) $(ZLIB_CFLAGS) \
- $(ERLANG_LIBS) $(ERLANG_CFLAGS) \
- -o $@ $(DYNAMIC_LIB_CFLAGS)
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
+ $(subst ../,,$(subst .so,.c,$@)) \
+ $(LIBS) \
+ $(ZLIB_LIBS) \
+ $(ZLIB_CFLAGS) \
+ $(ERLANG_LIBS) \
+ $(ERLANG_CFLAGS) \
+ -o $@ \
+ $(DYNAMIC_LIB_CFLAGS)
clean:
rm -f $(BEAMS) $(ERLSHLIBS)
diff --git a/src/mod_irc/Makefile.in b/src/mod_irc/Makefile.in
index d62ac20be..5000721a6 100644
--- a/src/mod_irc/Makefile.in
+++ b/src/mod_irc/Makefile.in
@@ -36,10 +36,13 @@ $(OUTDIR)/%.beam: %.erl
# erl -s make all report "{outdir, \"..\"}" -noinput -s erlang halt
$(ERLSHLIBS): ../%.so: %.c
- $(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) \
- $(subst ../,,$(subst .so,.c,$@)) $(LIBS) \
- $(ERLANG_CFLAGS) $(ERLANG_LIBS) \
- -o $@ $(DYNAMIC_LIB_CFLAGS)
+ $(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) \
+ $(subst ../,,$(subst .so,.c,$@)) \
+ $(LIBS) \
+ $(ERLANG_CFLAGS) \
+ $(ERLANG_LIBS) \
+ -o $@ \
+ $(DYNAMIC_LIB_CFLAGS)
clean:
rm -f $(BEAMS) $(ERLSHLIBS)
diff --git a/src/stringprep/Makefile.in b/src/stringprep/Makefile.in
index 99efbeb31..248aee693 100644
--- a/src/stringprep/Makefile.in
+++ b/src/stringprep/Makefile.in
@@ -37,10 +37,12 @@ $(OUTDIR)/%.beam: %.erl
# erl -s make all report "{outdir, \"..\"}" -noinput -s erlang halt
$(ERLSHLIBS): ../%.so: %.c uni_data.c uni_norm.c
- $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) \
- $(subst ../,,$(subst .so,.c,$@)) $(LIBS) \
- $(ERLANG_LIBS) $(ERLANG_CFLAGS) \
- -o $@ $(DYNAMIC_LIB_CFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) \
+ $(subst ../,,$(subst .so,.c,$@)) $(LIBS) \
+ $(ERLANG_LIBS) \
+ $(ERLANG_CFLAGS) \
+ -o $@ \
+ $(DYNAMIC_LIB_CFLAGS)
clean:
rm -f $(BEAMS) $(ERLSHLIBS)
diff --git a/src/tls/Makefile.in b/src/tls/Makefile.in
index cb90a3105..dfb8c87d0 100644
--- a/src/tls/Makefile.in
+++ b/src/tls/Makefile.in
@@ -40,11 +40,15 @@ $(OUTDIR)/%.beam: %.erl
# erl -s make all report "{outdir, \"..\"}" -noinput -s erlang halt
$(ERLSHLIBS): ../%.so: %.c
- $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
- $(subst ../,,$(subst .so,.c,$@)) $(LIBS) \
- $(SSL_LIBS) $(SSL_CFLAGS) \
- $(ERLANG_LIBS) $(ERLANG_CFLAGS) \
- -o $@ $(DYNAMIC_LIB_CFLAGS)
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
+ $(subst ../,,$(subst .so,.c,$@)) \
+ $(LIBS) \
+ $(SSL_LIBS) \
+ $(SSL_CFLAGS) \
+ $(ERLANG_LIBS) \
+ $(ERLANG_CFLAGS) \
+ -o $@ \
+ $(DYNAMIC_LIB_CFLAGS)
clean:
rm -f $(BEAMS) $(ERLSHLIBS)
--
2.40.0