diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/Makefile.in | 9 | ||||
| -rw-r--r-- | src/ejabberd_zlib/Makefile.in | 9 | ||||
| -rw-r--r-- | src/mod_irc/Makefile.in | 9 | ||||
| -rw-r--r-- | src/stringprep/Makefile.in | 9 | ||||
| -rw-r--r-- | src/tls/Makefile.in | 9 |
6 files changed, 48 insertions, 5 deletions
@@ -1,3 +1,11 @@ +2006-08-28 Mickael Remond <mickael.remond@process-one.net> + + * Makefile.in: Fix for MacOSX compilation. + * ejabberd_zlib/Makefile.in: Likewise. + * mod_irc/Makefile.in: Likewise. + * stringprep/Makefile.in: Likewise. + * tls/Makefile.in: Likewise. + 2006-08-27 Alexey Shchepin <alexey@sevcom.net> * src/mod_muc/mod_muc_room.erl: Fixed logging configuring diff --git a/src/Makefile.in b/src/Makefile.in index 9ccbe79a9..9b6095be0 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -44,6 +44,13 @@ ETCDIR = $(DESTDIR)@prefix@/etc/ejabberd ASN_FLAGS = -bber_bin +der +compact_bit_string +optimize +noobj +ifeq ($(shell uname),Darwin) +DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress +else +# Assume Linux-style dynamic library flags +DYNAMIC_LIB_CFLAGS = -fpic -shared +endif + all: $(ERLSHLIBS) compile-beam all-recursive compile-beam: XmppAddr.hrl $(BEAMS) @@ -70,7 +77,7 @@ $(ERLSHLIBS): %.so: %.c $(subst ../,,$(subst .so,.c,$@)) \ $(EXPAT_LIBS) $(EXPAT_CFLAGS) \ $(ERLANG_LIBS) $(ERLANG_CFLAGS) \ - -o $@ -fpic -shared + -o $@ $(DYNAMIC_LIB_CFLAGS) install: all install -d $(BEAMDIR) diff --git a/src/ejabberd_zlib/Makefile.in b/src/ejabberd_zlib/Makefile.in index 1b4b5a021..2a44860c5 100644 --- a/src/ejabberd_zlib/Makefile.in +++ b/src/ejabberd_zlib/Makefile.in @@ -6,6 +6,13 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @ZLIB_LIBS@ @ERLANG_LIBS@ +ifeq ($(shell uname),Darwin) +DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress +else +# Assume Linux-style dynamic library flags +DYNAMIC_LIB_CFLAGS = -fpic -shared +endif + SUBDIRS = ERLSHLIBS = ../ejabberd_zlib_drv.so @@ -26,7 +33,7 @@ $(OUTDIR)/%.beam: %.erl $(ERLSHLIBS): ../%.so: %.c $(CC) -Wall $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \ $(subst ../,,$(subst .so,.c,$@)) $(LIBS) \ - -o $@ -fpic -shared + -o $@ $(DYNAMIC_LIB_CFLAGS) clean: rm -f $(OBJS) $(ERLSHLIBS) diff --git a/src/mod_irc/Makefile.in b/src/mod_irc/Makefile.in index 0a7cd5677..a206027d5 100644 --- a/src/mod_irc/Makefile.in +++ b/src/mod_irc/Makefile.in @@ -6,6 +6,13 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @ERLANG_LIBS@ @LIBICONV@ +ifeq ($(shell uname),Darwin) +DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress +else +# Assume Linux-style dynamic library flags +DYNAMIC_LIB_CFLAGS = -fpic -shared +endif + SUBDIRS = ERLSHLIBS = ../iconv_erl.so @@ -28,7 +35,7 @@ $(OUTDIR)/%.beam: %.erl $(ERLSHLIBS): ../%.so: %.c $(CC) -Wall $(INCLUDES) $(CFLAGS) $(LDFLAGS) \ $(subst ../,,$(subst .so,.c,$@)) $(LIBS) \ - -o $@ -fpic -shared + -o $@ $(DYNAMIC_LIB_CFLAGS) clean: rm -f $(OBJS) $(ERLSHLIBS) diff --git a/src/stringprep/Makefile.in b/src/stringprep/Makefile.in index 7717878a1..2d858cc2e 100644 --- a/src/stringprep/Makefile.in +++ b/src/stringprep/Makefile.in @@ -6,6 +6,13 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @ERLANG_LIBS@ +ifeq ($(shell uname),Darwin) +DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress +else +# Assume Linux-style dynamic library flags +DYNAMIC_LIB_CFLAGS = -fpic -shared +endif + SUBDIRS = ERLSHLIBS = ../stringprep_drv.so @@ -26,7 +33,7 @@ $(OUTDIR)/%.beam: %.erl $(ERLSHLIBS): ../%.so: %.c uni_data.c uni_norm.c gcc -Wall -O2 $(CFLAGS) $(LDFLAGS) $(INCLUDES) \ $(subst ../,,$(subst .so,.c,$@)) $(LIBS) \ - -o $@ -fpic -shared + -o $@ $(DYNAMIC_LIB_CFLAGS) clean: rm -f $(OBJS) $(ERLSHLIBS) diff --git a/src/tls/Makefile.in b/src/tls/Makefile.in index 93f99032d..4b32fd84d 100644 --- a/src/tls/Makefile.in +++ b/src/tls/Makefile.in @@ -6,6 +6,13 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @SSL_LIBS@ @ERLANG_LIBS@ +ifeq ($(shell uname),Darwin) +DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress +else +# Assume Linux-style dynamic library flags +DYNAMIC_LIB_CFLAGS = -fpic -shared +endif + SUBDIRS = ERLSHLIBS = ../tls_drv.so @@ -26,7 +33,7 @@ $(OUTDIR)/%.beam: %.erl $(ERLSHLIBS): ../%.so: %.c $(CC) -Wall $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \ $(subst ../,,$(subst .so,.c,$@)) $(LIBS) \ - -o $@ -fpic -shared + -o $@ -fpic $(DYNAMIC_LIB_CFLAGS) clean: rm -f $(OBJS) $(ERLSHLIBS) |