From: Andrew McNab <andrew.mcnab@manchester.ac.uk>
Date: Sun, 13 Feb 2005 22:05:09 +0000 (+0000)
Subject: Fix libgridsite_globus.so target
X-Git-Tag: gridsite-core_R_1_1_5~2
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=d37a67d72c2a4c5eb917e6999ecf7e9930b090b1;p=jra1mw.git

Fix libgridsite_globus.so target
---

diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile
index 3a130cf..31c9a55 100644
--- a/org.gridsite.core/src/Makefile
+++ b/org.gridsite.core/src/Makefile
@@ -48,19 +48,10 @@ ifndef MYCFLAGS
 export MYCFLAGS=-I. -I../interface -I/usr/include/httpd -I/usr/include/apr-0 -I/opt/glite/include
 endif
 
-#ifndef OPENSSL_FLAGS
-#export OPENSSL_FLAGS=-I/usr/include
-#endif
-
 ifndef MYLDFLAGS
 export MYLDFLAGS=-L.
-# export MYLDFLAGS=-L. -L/opt/glite/lib -lvomsc
 endif
 
-#ifndef OPENSSL_GLOBUS_LIBS
-#export OPENSSL_GLOBUS_LIBS=-L/usr/lib
-#endif
-
 #
 # Build
 #
@@ -96,7 +87,8 @@ grst_http.o: grst_http.c ../interface/gridsite.h
 
 ifdef OPENSSL_GLOBUS_LIBS
 
-libgridsite_globus.so.$(VERSION): grst_x509.o grst_gacl.o grst_http.o
+libgridsite_globus.so.$(VERSION): \
+               grst_x509_globus.o grst_gacl_globus.o grst_http_globus.o
 	gcc -shared -Wl,-soname,libgridsite_globus.so.$(MINOR_VERSION) \
          -o libgridsite_globus.so.$(PATCH_VERSION) \
          grst_x509_globus.o grst_gacl_globus.o grst_http_globus.o