--- ./test/Makefile.orig 2005-09-15 19:26:44.000000000 +0200 +++ ./test/Makefile 2005-11-03 16:13:55.000000000 +0100 @@ -6,23 +6,22 @@ # ***** Platform specific flags ****** # CC = g++ -CFLAGS = -g $(PROFILE) -I. -I$(INCLDIR) $(OSPTNLOGDEBUG) -D_POSIX_THREADS -D_REENTRANT -DOPENSSL_NO_KRB5 -DOSP_SDK +CFLAGS = $(RPM_OPT_FLAGS) -I. -I$(INCLDIR) $(OSPTNLOGDEBUG) -D_POSIX_THREADS -D_REENTRANT -DOPENSSL_NO_KRB5 -DOSP_SDK #CC = /usr/vws/bin/cc #CFLAGS = -g -v -xCC -I. -I$(INCLDIR) $(OSPTNLOGDEBUG) -D_POSIX_THREADS -D_REENTRANT -DOPENSSL_NO_KRB5 -DOSP_SDK -LFLAGS = $(PROFILELIB) -lsocket -lnsl -lpthread -lmtmalloc -ldl -lm -LFLAGS_LINUX = $(PROFILELIB) -lpthread -lm -ldl +LFLAGS = $(PROFILELIB) -lpthread -lm -ldl SOFLAGS = -shared SOOBJ = libosptk.so -AR = /usr/ccs/bin/ar -ARLIBDIR = ../lib +AR = ar +ARLIBDIR = ../src ARLIB = -losptk #LINT = /usr/ccs/bin/ucblint -MKDEP = /usr/openwin/bin/makedepend -SSLINC = -I../crypto -SSLLIBDIR = $../lib +MKDEP = makedepend +SSLINC = -I/usr/include/openssl +SSLLIBDIR = -L/usr/lib SSLLIB = -lssl -lcrypto -SSL = -L$(SSLLIBDIR) $(SSLLIB) +SSL = $(SSLLIBDIR) $(SSLLIB) # #################################################################### @@ -34,12 +33,8 @@ $(CC) $(CFLAGS) $(SSLINC) $(<) -c all: $(OBJS) - $(PURE) $(CC) $(PROFILE) $(OBJS) -o ../bin/test_app \ - $(ARLIBDIR)/libosptk.a $(LFLAGS) -L$(ARLIBDIR) $(ARLIB) $(SSL) - -linux: $(OBJS) - $(PURE) $(CC) $(PROFILE) $(OBJS) -o ../bin/test_app \ - $(ARLIBDIR)/libosptk.a $(LFLAGS_LINUX) -L$(ARLIBDIR) $(ARLIB) $(SSL) + $(PURE) $(CC) $(PROFILE) $(OBJS) -o test_app \ + $(LFLAGS) -L$(ARLIBDIR) $(ARLIB) $(SSL) clean : rm -f *.o ../bin/test_app --- ./src/Makefile.orig 2005-09-15 19:26:44.000000000 +0200 +++ ./src/Makefile 2005-11-03 16:24:16.000000000 +0100 @@ -7,15 +7,16 @@ CC = gcc AR = ar -LFLAGS = -lsocket -lnsl -lm -lpthread -ARLIB = ../lib/libosptk.a +LFLAGS = -lnsl -lm -lpthread -lssl -lcrypto +ARLIB = libosptk.a +SHLIB = libosptk.so.0 # WARNING !! # If not using gcc for compiling the toolkit # and instead using the Sun Compiler, please comment the line below for proper # compilation. # -GCCFLAGS = -Wall -D_GNU_SOURCE -fPIC +GCCFLAGS = $(RPM_OPT_FLAGS) -Wall -D_GNU_SOURCE -fPIC # # CFLAGS definition @@ -25,14 +26,13 @@ # This is for PRODUCTION mode of compilation CFLAGS = -O -DOSP_ALLOW_DUP_TXN -DOSP_NO_DELETE_CHECK -DOSP_SDK -D_POSIX_THREADS -D_REENTRANT -DOPENSSL_NO_KRB5 $(GCCFLAGS) - # # # SSL library selection # for OpenSSL SSLOBJ = ospopenssl.o -SSLINC = ../crypto -INCL = -I$(SSLINC) -I$(INCLDIR) +SSLINC = -I/usr/include/openssl +INCL = $(SSLINC) -I$(INCLDIR) #################################################################### OBJS = osppkcs1.o osppkcs8.o osppkcs7.o ospcryptowrap.o ospasn1ids.o \ @@ -54,18 +54,15 @@ .c.o: $(CC) $(CFLAGS) $(CRYPTOCFLAGS) $(INCL) $(<) -c -default: - @ echo 'Use - make build, to build the osp library' - @ echo "" - @ echo 'Use - make install, to install the osp library' - @ echo ' make install will install the files in: $(INSTALL_PATH)' - @ echo ' Modify the INSTALL_PATH variable to install the files at a different location' - @ echo ' make install might require root previliges' - +default: shared static -build : $(OBJS) +static: $(OBJS) $(AR) -r $(ARLIB) $(OBJS) +shared: $(OBJS) + gcc $(CFLAGS) -shared -Wl,-soname=libosptk.so.0 -o $(SHLIB) $(LFLAGS) $(OBJS) + ln -s $(SHLIB) libosptk.so + install: build cp -r ../include/osp/ $(INSTALL_PATH)/include/ ifeq ($(wildcard $(INSTALL_PATH)/lib),) @@ -74,7 +71,7 @@ cp ../lib/libosptk.a $(INSTALL_PATH)/lib clean : - rm -f $(OBJS) $(ARLIB) + rm -f $(OBJS) $(ARLIB) $(SHLIB) *.so # DO NOT DELETE --- ./enroll/Makefile.orig 2005-09-15 19:26:44.000000000 +0200 +++ ./enroll/Makefile 2005-11-03 16:30:21.000000000 +0100 @@ -2,23 +2,22 @@ CC = gcc # For OpenSSL: -SSLINC = ../crypto -SSL_LIBDIRS = -L../lib +SSLINC = -I/usr/include/openssl +SSL_LIBDIRS = -L/usr/lib SSL_LIBS = -lssl -lcrypto SSL_OBJS = ../src/ospopenssl.o -INCLDIRS = -I./ -I../include -I$(SSLINC) +INCLDIRS = -I./ -I../include $(SSLINC) #WARNING_FLAGS = -Wall -CFLAGS = -g $(WARNING_FLAGS) +CFLAGS = $(RPM_OPT_FLAGS) MACRO_FLAGS = -D_POSIX_THREADS -DSOLARIS -DOSPD_DEBUG -DOSP_SDK -DOPENSSL_NO_KRB5 -DOSPC_DEBUG=1 -LIBS = -lnsl -lsocket -ldl -lm -losptk $(SSL_LIBS) -lpthread -LIBS_LINUX = -losptk $(SSL_LIBS) -lpthread -ldl -lm -OSP_LIBDIR = -L../lib +LIBS = -losptk $(SSL_LIBS) -lpthread -ldl -lm +OSP_LIBDIR = -L../src LIBDIRS = $(OSP_LIBDIR) $(SSL_LIBDIRS) -EXEC =../bin/enroll +EXEC = enroll CREATED_OBJS = osptnepinit.o osptnepenroll.o osptnep.o osptneputil.o OBJS = $(CREATED_OBJS) $(OSP_OBJS) $(SSL_OBJS) @@ -31,8 +30,5 @@ enroll: $(OBJS) $(PURIFY) $(CC) -o $(EXEC) $(OBJS) $(LIBDIRS) $(LIBS) $(INCLDIRS) -linux: $(OBJS) - $(PURIFY) $(CC) -o $(EXEC) $(OBJS) $(LIBDIRS) $(LIBS_LINUX) $(INCLDIRS) - clean: rm -f $(CREATED_OBJS) $(EXEC)
