From 392d64ee8bd137c75fc6187e49a4757533e77e3c Mon Sep 17 00:00:00 2001 From: Alexey Shchepin Date: Fri, 17 Oct 2003 19:15:38 +0000 Subject: * src/configure.ac: Build system now done using autoconf (thanks to Balabanov Dmitry) * src/aclocal.m4: Likewise * src/**/Makefile.in: Likewise * src/mod_roster.erl (process_item_set_t): Slightly improved performance * src/jd2ejd.erl: Added missed closing of XML stream process, removed timeout value from import_file/1 * src/ejabberd_auth.erl: Added checks for invalid user name SVN Revision: 152 --- src/stringprep/Makefile | 42 ---------------------------------------- src/stringprep/Makefile.in | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 42 deletions(-) delete mode 100644 src/stringprep/Makefile create mode 100644 src/stringprep/Makefile.in (limited to 'src/stringprep') diff --git a/src/stringprep/Makefile b/src/stringprep/Makefile deleted file mode 100644 index 5b4b3c8a..00000000 --- a/src/stringprep/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# $Id$ - -include ../Makefile.inc - -INCLUDES = -I$(ERLANG_DIR)/usr/include \ - -I$(EI_DIR)/include \ - -I/usr/local/include - -LIBDIRS = -L$(EI_DIR)/lib -L/usr/local/lib - -ERLSHLIBS = ../stringprep_drv.so - - - -OUTDIR = .. -EFLAGS = -I .. -pz .. -OBJS = \ - $(OUTDIR)/stringprep.beam - -all: $(OBJS) $(ERLSHLIBS) - -$(OUTDIR)/%.beam: %.erl - erlc -W $(EFLAGS) -o $(OUTDIR) $< - - - -#all: $(ERLSHLIBS) -# erl -s make all report "{outdir, \"..\"}" -noinput -s erlang halt - -$(ERLSHLIBS): ../%.so: %.c uni_data.c uni_norm.c - gcc -Wall -O2 $(INCLUDES) $(LIBDIRS) \ - $(subst ../,,$(subst .so,.c,$@)) \ - -lerl_interface \ - -lei \ - -o $@ -fpic -shared \ - -clean: - rm -f *.beam - -TAGS: - etags *.erl - diff --git a/src/stringprep/Makefile.in b/src/stringprep/Makefile.in new file mode 100644 index 00000000..a33d1f50 --- /dev/null +++ b/src/stringprep/Makefile.in @@ -0,0 +1,48 @@ +# $Id$ + + +CC = @CC@ +CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ + +INCLUDES = @ERLANG_CFLAGS@ + +LIBDIRS = @ERLANG_LIBS@ + +SUBDIRS = + + +ERLSHLIBS = ../stringprep_drv.so + + + +OUTDIR = .. +EFLAGS = -I .. -pz .. +OBJS = \ + $(OUTDIR)/stringprep.beam + +all: $(OBJS) $(ERLSHLIBS) + +$(OUTDIR)/%.beam: %.erl + erlc -W $(EFLAGS) -o $(OUTDIR) $< + + + +#all: $(ERLSHLIBS) +# erl -s make all report "{outdir, \"..\"}" -noinput -s erlang halt + +$(ERLSHLIBS): ../%.so: %.c uni_data.c uni_norm.c + gcc -Wall -O2 $(INCLUDES) $(LIBDIRS) \ + $(subst ../,,$(subst .so,.c,$@)) \ + -lerl_interface \ + -lei \ + -o $@ -fpic -shared \ + +clean: + rm -f $(OBJS) $(ERLSHLIBS) + +TAGS: + etags *.erl + -- cgit v1.2.3