From b7d0d9d61ad9cf103d38f5671834ed504e0ef0d3 Mon Sep 17 00:00:00 2001
From: Tomas Guisasola <tomas@luaforge.net>
Date: Sun, 5 Jun 2005 00:38:22 +0000
Subject: Standardizing Makefile and config. Small correction in README.

---
 lualdap/Makefile | 64 +++++++++++---------------------------------------------
 lualdap/README   |  3 +--
 lualdap/config   | 26 +++++++++++++++++++++++
 3 files changed, 39 insertions(+), 54 deletions(-)
 create mode 100755 lualdap/config

diff --git a/lualdap/Makefile b/lualdap/Makefile
index aece73a..2dcc5ae 100755
--- a/lualdap/Makefile
+++ b/lualdap/Makefile
@@ -1,73 +1,33 @@
-# System's libraries directory (where binary libraries are installed)
-LUA_LIBDIR= /usr/local/lib/lua/5.0
-# Lua includes directory
-LUA_INC= /usr/local/include/lua5
-# OS dependent
-LIB_EXT= .so
-#LIB_EXT= .dylib
-LIB_OPTION= -shared #for Linux
-#LIB_OPTION= -dynamiclib #for MacOS X
-
-# On FreeBSD systems, the following line should be commented
-DLLIB= -ldl
-LUA_LIBS= -L/usr/lib -llua -llualib -lm
-
-COMPAT_DIR= ../compat/src
-WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -ansi
-#WARN= -Wall -Wmissing-prototypes -Wmissing-declarations -ansi
-INCS= -I$(LUA_INC) -I$(COMPAT_DIR)
-LIBS= $(LUA_LIBS) $(DLLIB)
-CFLAGS= $(WARN) $(INCS)
-CC= gcc
+# $Id: Makefile,v 1.21 2005-06-05 00:38:22 tomas Exp $
 
 T= lualdap
 V= 1.0
-VERSION= $V
-PKG= lualdap-$(VERSION)
-DIST_DIR= $(PKG)
-TAR_FILE= $(PKG).tar.gz
-ZIP_FILE= $(PKG).zip
-SRCS= README Makefile \
-	src/lualdap.c \
-	tests/test.lua \
-	doc/us/index.html doc/us/manual.html doc/us/license.html doc/us/lualdap.png 
+
+include ./config
 
 AR= ar rcu
 RANLIB= ranlib
 
 OBJS= src/lualdap.o $(COMPAT_DIR)/compat-5.1.o
-LIB= src/lib$T$(VERSION).a
-LIBNAME= lib$T$(VERSION)$(LIB_EXT)
+LIB= src/lib$T-$V.a
 
-dist: dist_dir
-	tar -czf $(TAR_FILE) $(DIST_DIR)
-	zip -rq $(ZIP_FILE) $(DIST_DIR)/*
-	rm -rf $(DIST_DIR)
 
-dist_dir:
-	mkdir $(DIST_DIR)
-	cp README Makefile $(DIST_DIR)
-	cp -r src tests doc vc6 $(DIST_DIR)
-	find $(DIST_DIR) -name CVS | xargs rm -rf
+dynamic: src/$(LIBNAME)
+src/$(LIBNAME): $(OBJS)
+	$(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS)
 
 lib: $(LIB)
  $(LIB): $(OBJS)
 	$(AR) $@ $(OBJS)
 	$(RANLIB) $@
 
-dynamic: src/$(LIBNAME)
-src/$(LIBNAME): $(OBJS)
-	$(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS) $(LIBS) -lldap
+$(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c
+	$(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
 
-install: lib src/$(LIBNAME)
+install: dynamic src/$(LIBNAME)
 	mkdir -p $(LUA_LIBDIR)
 	cp src/$(LIBNAME) $(LUA_LIBDIR)
-	cd $(LUA_LIBDIR); ln -f -s $(LIBNAME) $T$(LIB_EXT)
-
-$(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c
-	$(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
+	ln -f -s $(LUA_LIBDIR)/$(LIBNAME) $(LUA_LIBDIR)/$T.so
 
 clean:
-	rm -f $(OBJS) $(LIB) $(SO) $(DYLIB) $(DLL) $(TAR_FILE) $(ZIP_FILE)
-
-# $Id: Makefile,v 1.20 2005-04-08 18:49:17 tomas Exp $
+	rm -f $(OBJS) $(LIB) src/$(LIBNAME)
diff --git a/lualdap/README b/lualdap/README
index ad28599..b0d45c1 100755
--- a/lualdap/README
+++ b/lualdap/README
@@ -8,6 +8,5 @@ Here goes a small description of the files in the distribution
 	/vc6/*          -- Build files for MS Visual C 6
     Makefile        -- Makefile for Unix systems
     README          -- This file
-    test.lua        -- Overall API test script
 
-$Id: README,v 1.4 2005-03-24 22:35:09 carregal Exp $
+$Id: README,v 1.5 2005-06-05 00:38:22 tomas Exp $
diff --git a/lualdap/config b/lualdap/config
new file mode 100755
index 0000000..820ff2a
--- /dev/null
+++ b/lualdap/config
@@ -0,0 +1,26 @@
+# Installation directories
+# System's libraries directory (where binary libraries are installed)
+LUA_LIBDIR= /usr/local/lib/lua/5.0
+# Lua includes directory
+LUA_INC= /usr/local/include/lua5
+# OpenLDAP includes directory
+OPENLDAP_INC= /usr/local/include
+
+# OS dependent
+LIB_OPTION= -shared #for Linux
+#LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
+
+LIBNAME= lib$T-$V.so
+COMPAT_DIR= ../compat/src
+
+# Compilation parameters
+# On FreeBSD systems, the following line should be commented
+DLLIB= -ldl
+#LUA_LIBS= -L/usr/lib -llua50 -lm
+WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -ansi
+INCS= -I$(LUA_INC) -I$(OPENLDAP_INC) -I$(COMPAT_DIR)
+LIBS= $(LUA_LIBS) $(DLLIB)
+CFLAGS= $(WARN) $(INCS)
+CC= gcc
+
+# $Id: config,v 1.1 2005-06-05 00:38:22 tomas Exp $
-- 
cgit v1.2.3-59-g8ed1b