mirror of
https://github.com/processone/ejabberd.git
synced 2024-10-27 15:02:14 +01:00
* Makefile.in: Fix for MacOSX compilation (EJAB-124).
* ejabberd_zlib/Makefile.in: Likewise. * mod_irc/Makefile.in: Likewise. * stringprep/Makefile.in: Likewise. * tls/Makefile.in: Likewise. SVN Revision: 596
This commit is contained in:
parent
d3b1bbda47
commit
a7f22bfded
@ -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>
|
2006-08-27 Alexey Shchepin <alexey@sevcom.net>
|
||||||
|
|
||||||
* src/mod_muc/mod_muc_room.erl: Fixed logging configuring
|
* src/mod_muc/mod_muc_room.erl: Fixed logging configuring
|
||||||
|
@ -44,6 +44,13 @@ ETCDIR = $(DESTDIR)@prefix@/etc/ejabberd
|
|||||||
|
|
||||||
ASN_FLAGS = -bber_bin +der +compact_bit_string +optimize +noobj
|
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
|
all: $(ERLSHLIBS) compile-beam all-recursive
|
||||||
|
|
||||||
compile-beam: XmppAddr.hrl $(BEAMS)
|
compile-beam: XmppAddr.hrl $(BEAMS)
|
||||||
@ -70,7 +77,7 @@ $(ERLSHLIBS): %.so: %.c
|
|||||||
$(subst ../,,$(subst .so,.c,$@)) \
|
$(subst ../,,$(subst .so,.c,$@)) \
|
||||||
$(EXPAT_LIBS) $(EXPAT_CFLAGS) \
|
$(EXPAT_LIBS) $(EXPAT_CFLAGS) \
|
||||||
$(ERLANG_LIBS) $(ERLANG_CFLAGS) \
|
$(ERLANG_LIBS) $(ERLANG_CFLAGS) \
|
||||||
-o $@ -fpic -shared
|
-o $@ $(DYNAMIC_LIB_CFLAGS)
|
||||||
|
|
||||||
install: all
|
install: all
|
||||||
install -d $(BEAMDIR)
|
install -d $(BEAMDIR)
|
||||||
|
@ -6,6 +6,13 @@ CPPFLAGS = @CPPFLAGS@
|
|||||||
LDFLAGS = @LDFLAGS@
|
LDFLAGS = @LDFLAGS@
|
||||||
LIBS = @LIBS@ @ZLIB_LIBS@ @ERLANG_LIBS@
|
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 =
|
SUBDIRS =
|
||||||
|
|
||||||
ERLSHLIBS = ../ejabberd_zlib_drv.so
|
ERLSHLIBS = ../ejabberd_zlib_drv.so
|
||||||
@ -26,7 +33,7 @@ $(OUTDIR)/%.beam: %.erl
|
|||||||
$(ERLSHLIBS): ../%.so: %.c
|
$(ERLSHLIBS): ../%.so: %.c
|
||||||
$(CC) -Wall $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
|
$(CC) -Wall $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
|
||||||
$(subst ../,,$(subst .so,.c,$@)) $(LIBS) \
|
$(subst ../,,$(subst .so,.c,$@)) $(LIBS) \
|
||||||
-o $@ -fpic -shared
|
-o $@ $(DYNAMIC_LIB_CFLAGS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(OBJS) $(ERLSHLIBS)
|
rm -f $(OBJS) $(ERLSHLIBS)
|
||||||
|
@ -6,6 +6,13 @@ CPPFLAGS = @CPPFLAGS@
|
|||||||
LDFLAGS = @LDFLAGS@
|
LDFLAGS = @LDFLAGS@
|
||||||
LIBS = @LIBS@ @ERLANG_LIBS@ @LIBICONV@
|
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 =
|
SUBDIRS =
|
||||||
|
|
||||||
ERLSHLIBS = ../iconv_erl.so
|
ERLSHLIBS = ../iconv_erl.so
|
||||||
@ -28,7 +35,7 @@ $(OUTDIR)/%.beam: %.erl
|
|||||||
$(ERLSHLIBS): ../%.so: %.c
|
$(ERLSHLIBS): ../%.so: %.c
|
||||||
$(CC) -Wall $(INCLUDES) $(CFLAGS) $(LDFLAGS) \
|
$(CC) -Wall $(INCLUDES) $(CFLAGS) $(LDFLAGS) \
|
||||||
$(subst ../,,$(subst .so,.c,$@)) $(LIBS) \
|
$(subst ../,,$(subst .so,.c,$@)) $(LIBS) \
|
||||||
-o $@ -fpic -shared
|
-o $@ $(DYNAMIC_LIB_CFLAGS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(OBJS) $(ERLSHLIBS)
|
rm -f $(OBJS) $(ERLSHLIBS)
|
||||||
|
@ -6,6 +6,13 @@ CPPFLAGS = @CPPFLAGS@
|
|||||||
LDFLAGS = @LDFLAGS@
|
LDFLAGS = @LDFLAGS@
|
||||||
LIBS = @LIBS@ @ERLANG_LIBS@
|
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 =
|
SUBDIRS =
|
||||||
|
|
||||||
ERLSHLIBS = ../stringprep_drv.so
|
ERLSHLIBS = ../stringprep_drv.so
|
||||||
@ -26,7 +33,7 @@ $(OUTDIR)/%.beam: %.erl
|
|||||||
$(ERLSHLIBS): ../%.so: %.c uni_data.c uni_norm.c
|
$(ERLSHLIBS): ../%.so: %.c uni_data.c uni_norm.c
|
||||||
gcc -Wall -O2 $(CFLAGS) $(LDFLAGS) $(INCLUDES) \
|
gcc -Wall -O2 $(CFLAGS) $(LDFLAGS) $(INCLUDES) \
|
||||||
$(subst ../,,$(subst .so,.c,$@)) $(LIBS) \
|
$(subst ../,,$(subst .so,.c,$@)) $(LIBS) \
|
||||||
-o $@ -fpic -shared
|
-o $@ $(DYNAMIC_LIB_CFLAGS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(OBJS) $(ERLSHLIBS)
|
rm -f $(OBJS) $(ERLSHLIBS)
|
||||||
|
@ -6,6 +6,13 @@ CPPFLAGS = @CPPFLAGS@
|
|||||||
LDFLAGS = @LDFLAGS@
|
LDFLAGS = @LDFLAGS@
|
||||||
LIBS = @LIBS@ @SSL_LIBS@ @ERLANG_LIBS@
|
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 =
|
SUBDIRS =
|
||||||
|
|
||||||
ERLSHLIBS = ../tls_drv.so
|
ERLSHLIBS = ../tls_drv.so
|
||||||
@ -26,7 +33,7 @@ $(OUTDIR)/%.beam: %.erl
|
|||||||
$(ERLSHLIBS): ../%.so: %.c
|
$(ERLSHLIBS): ../%.so: %.c
|
||||||
$(CC) -Wall $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
|
$(CC) -Wall $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
|
||||||
$(subst ../,,$(subst .so,.c,$@)) $(LIBS) \
|
$(subst ../,,$(subst .so,.c,$@)) $(LIBS) \
|
||||||
-o $@ -fpic -shared
|
-o $@ -fpic $(DYNAMIC_LIB_CFLAGS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(OBJS) $(ERLSHLIBS)
|
rm -f $(OBJS) $(ERLSHLIBS)
|
||||||
|
Loading…
Reference in New Issue
Block a user