From 7621ab1fcc340715b2748f0b68b92271ee90dcde Mon Sep 17 00:00:00 2001 From: Marcel Poul Date: Mon, 3 Sep 2012 15:34:11 +0000 Subject: [PATCH] Prepare Makefile to use canl_mod_gridsite.c if needed. --- org.gridsite.core/src/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile index 6b508ed..d14ee91 100644 --- a/org.gridsite.core/src/Makefile +++ b/org.gridsite.core/src/Makefile @@ -82,6 +82,7 @@ endif # caNl library and headers have to be in standard system places. ifeq ($(GRIDSITE_WITH_CANL),yes) GRST_X509_FILE=grst_canl_x509.c +MOD_GRIDSITE_FILE=canl_mod_gridsite.c MYCANLLDFLAGS=-lcanl_c else GRST_X509_FILE=grst_x509.c @@ -281,12 +282,12 @@ gridsite-copy.cgi: gridsite-copy.c libgridsite.so.$(VERSION) $(CURL_CFLAGS) $(CURL_LIBS) \ $(MYFCGILIBS) -lgridsite -mod_gridsite.so: mod_gridsite.c mod_ssl-private.h libgridsite.so.$(VERSION) +mod_gridsite.so: ${MOD_GRIDSITE_FILE} mod_ssl-private.h libgridsite.so.$(VERSION) gcc -g $(MYCFLAGS) -shared -Wl,-soname=gridsite_module \ -I/usr/kerberos/include \ - $(XML2_CFLAGS) -lcrypto -lssl \ + $(XML2_CFLAGS) -lcrypto -lssl ${MYCANLLDFLAGS} \ -DVERSION=\"$(VERSION)\" -o mod_gridsite.so \ - mod_gridsite.c $(MYLDFLAGS) -lgridsite + ${MOD_GRIDSITE_FILE} $(MYLDFLAGS) -lgridsite mod_gridsite_example.so: mod_gridsite_example.c gcc -g -shared -Wl,-soname=gridsite_example_module \ -- 1.8.2.3