Happy New Year (belated)

[openldap] / contrib / slapd-modules / comp_match / Makefile

diff --git a/contrib/slapd-modules/comp_match/Makefile b/contrib/slapd-modules/comp_match/Makefile
index 7afdef14d56395a460a8fcab4b527cd01b56fa8f..5a2ad3fd35a1ddfd0382e0f7e107b9af162d6785 100644 (file)
--- a/contrib/slapd-modules/comp_match/Makefile
+++ b/contrib/slapd-modules/comp_match/Makefile
@@ -1,7 +1,7 @@
 # $OpenLDAP$
 # This work is part of OpenLDAP Software <http://www.openldap.org/>.
 #
-# Copyright 2003-2004 The OpenLDAP Foundation.
+# Copyright 2003-2008 The OpenLDAP Foundation.
 # Portions Copyright 2004 by IBM Corporation.
 # All rights reserved.
 
@@ -15,22 +15,22 @@
 # top-level directory of the distribution or, alternatively, at
 # <http://www.OpenLDAP.org/license.html>.
 
-topbuilddir = ../../../../build
 topsrcdir = ../../..
-snaccdir = /home/slim/snacc
+snaccdir = ../$(topsrcdir)/snacc
+openssldir = /usr/local/include/openssl
 
-LIBTOOL=$(topbuilddir)/libtool
+LIBTOOL=$(topsrcdir)/libtool
 OPT=-g -O2 -DLDAP_COMPONENT
 CC=gcc
 
 SNACC_INC=-I$(snaccdir) -I$(snaccdir)/c-lib/inc
-
 LDAP_INC=-I$(topsrcdir)/include -I$(topsrcdir)/servers/slapd -I$(topbuilddir)/include
-INCS=$(LDAP_INC) $(SNACC_INC)
+OPENSSL_INC=-I$(openssldir)
+INCS=$(LDAP_INC) $(SNACC_INC) $(OPENSSL_INC)
 
 SNACC_LIB=$(snaccdir)/c-lib/libcasn1.a
-SSL_LIB=-lcrypto
-LDAP_LIB=-lldap_r -llber
+SSL_LIB=/usr/local/lib/lcrypto
+
 LIBS=$(LDAP_LIB) $(SNACC_LIB) $(SSL_LIB)
 
 all:   compmatch.la
@@ -42,19 +42,25 @@ componentlib.lo:    componentlib.c
 certificate.lo:        certificate.c
        $(LIBTOOL) --mode=compile $(CC) $(OPT) $(INCS) -c $?
 
+crl.lo:        crl.c
+       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(INCS) -c $?
+
+authorityKeyIdentifier.lo:     authorityKeyIdentifier.c
+       $(LIBTOOL) --mode=compile $(CC) $(OPT) $(INCS) -c $?
+
 asn_to_syn_mr.lo:      asn_to_syn_mr.c
        $(LIBTOOL) --mode=compile $(CC) $(OPT) $(INCS) -c $?
 
 init.lo:       init.c
        $(LIBTOOL) --mode=compile $(CC) $(OPT) $(INCS) -c $?
 
-compmatch.la:  componentlib.lo init.lo certificate.lo asn_to_syn_mr.lo
+compmatch.la:  componentlib.lo init.lo certificate.lo asn_to_syn_mr.lo authorityKeyIdentifier.lo crl.lo
        $(LIBTOOL) --mode=link $(CC) $(OPT) $(LIBS) -version-info 0:0:0 \
        -rpath /usr/local/libexec/openldap -module -o $@ $? $(LIBS)
 
 clean:
-       \rm compmatch.la componentlib.lo certificate.lo asn_to_syn_mr.lo\
-               init.o init.lo componentlib.o certificate.o asn_to_syn_mr.o
+       \rm compmatch.la componentlib.lo certificate.lo asn_to_syn_mr.lo authorityKeyIdentifier.lo crl.lo\
+               init.o init.lo componentlib.o certificate.o asn_to_syn_mr.o authorityKeyIdentifier.o crl.o
 install:
        cp -r .libs $(topsrcdir)/tests/data/comp_libs
        cp compmatch.la  $(topsrcdir)/tests/data/comp_libs