[Ltb-changes] r46 - openldap-ppolicy-check-password/trunk

coudot at ltb-project.org coudot at ltb-project.org
Thu Nov 26 13:44:52 CET 2009


Author: coudot
Date: 2009-11-26 13:44:52 +0100 (Thu, 26 Nov 2009)
New Revision: 46

Modified:
   openldap-ppolicy-check-password/trunk/Makefile
Log:
Optimize Makefile

Modified: openldap-ppolicy-check-password/trunk/Makefile
===================================================================
--- openldap-ppolicy-check-password/trunk/Makefile	2009-11-25 08:39:58 UTC (rev 45)
+++ openldap-ppolicy-check-password/trunk/Makefile	2009-11-26 12:44:52 UTC (rev 46)
@@ -13,15 +13,11 @@
 #
 CONFIG=/etc/openldap/check_password.conf
 
-OPT=-g -O2 -Wall -fpic 						\
-	-DHAVE_CRACKLIB -DCRACKLIB_DICTPATH="\"$(CRACKLIB)\""	\
-	-DCONFIG_FILE="\"$(CONFIG)\""					\
-	-DDEBUG
 
 # Where to find the OpenLDAP headers.
 #
-LDAP_INC=-I/home/pyb/tmp/openldap-2.3.39/include \
-	 -I/home/pyb/tmp/openldap-2.3.39/servers/slapd
+LDAP_INC=-I/usr/include/openldap/include \
+	 -I/usr/include/openldap/servers/slapd
 
 # Where to find the CrackLib headers.
 #
@@ -37,11 +33,17 @@
 #
 CRACKLIB_LIB=-lcrack
 
+CC_FLAGS=-g -O2 -Wall -fpic
+CRACKLIB_OPT=-DHAVE_CRACKLIB -DCRACKLIB_DICTPATH="\"$(CRACKLIB)\""
+DEBUG_OPT=-DDEBUG
+CONFIG_OPT=-DCONFIG_FILE="\"$(CONFIG)\""
+
+OPT=$(CC_FLAGS) $(CRACKLIB_OPT) $(CONFIG_OPT) $(DEBUG_OPT)
+
 LIBS=$(LDAP_LIB) $(CRACKLIB_LIB)
 
 LIBDIR=/usr/lib/openldap/
 
-
 all: 	check_password
 
 check_password.o:
@@ -51,7 +53,7 @@
 	$(CC) -shared -o check_password.so check_password.o $(CRACKLIB_LIB)
 
 install: check_password
-	cp -f check_password.so ../../../usr/lib/openldap/modules/
+	cp -f check_password.so $(LIBDIR)
 
 clean:
 	$(RM) check_password.o check_password.so check_password.lo



More information about the ltb-changes mailing list