[Fedora-directory-commits] adminutil/lib/libadmsslutil Makefile, 1.1.1.1, 1.2 admsslutil.c, 1.1.1.1, 1.2

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/adminutil/lib/libadmsslutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18818/lib/libadmsslutil

Modified Files:
	Makefile admsslutil.c 
Log Message:
[172166] Admin Util RPM
1) admin util library name has been updated from libadminutil10.so to
libadminutil.so.1.0 with symbolic links libadminutil.so and libadminutil.so.1
2) dropped static library 



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminutil/lib/libadmsslutil/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile	20 Jul 2005 22:51:32 -0000	1.1.1.1
+++ Makefile	6 Dec 2005 18:38:42 -0000	1.2
@@ -28,35 +28,34 @@
 
 include ../../nsdefs.mk
 
-OBJDEST=$(OBJDIR)/lib/libadmsslutil
+OBJLIBDIR=$(OBJDIR)/lib
+OBJDEST=$(OBJLIBDIR)/libadmsslutil
 
 ifeq ($(ARCH), WINNT)
   ifeq ($(DEBUG), fulld)
-    LIBS=$(OBJDIR)/lib/libadmsslutild_s$(ADMSDK_SO_VERSION).lib
-    SO_NAME=$(OBJDIR)/lib/libadmsslutild$(ADMSDK_SO_VERSION)
+    LIBS=$(OBJLIBDIR)/libadmsslutild_s$(ADMSDK_SO_VERSION).lib
+    SO_NAME=libadmsslutild
   else
-    LIBS=$(OBJDIR)/lib/libadmsslutil_s$(ADMSDK_SO_VERSION).lib
-    SO_NAME=$(OBJDIR)/lib/libadmsslutil$(ADMSDK_SO_VERSION)
+    LIBS=$(OBJLIBDIR)/libadmsslutil_s$(ADMSDK_SO_VERSION).lib
+    SO_NAME=libadmsslutil
   endif
 else
-  LIBS=$(OBJDIR)/lib/libadmsslutil$(ADMSDK_SO_VERSION).a
-  SO_NAME=$(OBJDIR)/lib/libadmsslutil$(ADMSDK_SO_VERSION)
-endif
-
-ifeq ($(ARCH), HPUX)
- SO_LIB=$(SO_NAME)$(DLL_PRESUF).sl
-else
- SO_LIB=$(SO_NAME)$(DLL_PRESUF).$(DLL_SUFFIX)
+  LIBS=$(OBJLIBDIR)/libadmsslutil-$(ADMSDK_SO_DOTVERSION).a
+  SO_NAME=libadmsslutil
 endif
 
 include ../../nsconfig.mk
 
+SO_COREEXT:=$(DLL_PRESUF).$(DLL_SUFFIX)
+SO_EXT:=$(SO_COREEXT).$(ADMSDK_SO_DOTVERSION)
+SO_LIB:=$(OBJLIBDIR)/$(SO_NAME)$(SO_EXT)
+
 ifeq ($(ARCH), AIX)
 override EXTRA_LIBS := -L.:/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib \
 	-bI:/usr/lib/lowsys.exp -L. -lC_r -lC -lpthreads -lc_r -lm \
 	/usr/lib/libc.a -ldl -lbsd -brtl -berok
 
-ADM_EXPORT_FILE=$(SO_NAME)$(DLL_PRESUF).exp
+ADM_EXPORT_FILE=$(OBJLIBDIR)/$(SO_NAME)$(DLL_PRESUF).exp
 endif
 
 DEPLIBS += $(ADMSDKLINK) $(ICULINK) $(LDAPLINK) $(SVRCORELINK) $(SECURITYLINK) $(NSPRLINK)
@@ -70,18 +69,18 @@
 OBJS=$(addprefix $(OBJDEST)/, certmgt.o secpwd.o sslerror.o admsslutil.o psetcssl.o \
 			      srvutilssl.o uginfossl.o $(OSOBJS))
 
-all: $(OBJDEST) $(LIBS) $(SO_LIB)
+all: $(OBJDEST) $(SO_LIB)
 
 
 $(OBJDEST):
-	echo $(LIBS)
 	echo $(SO_LIB)
 	mkdir -p $(OBJDEST)
 
-$(LIBS): $(OBJS)
-	rm -f $@
-	$(AR) $(OBJS)
-	$(RANLIB) $@
+# stop building static libraries
+#$(LIBS): $(OBJS)
+#	rm -f $@
+#	$(AR) $(OBJS)
+#	$(RANLIB) $@
 
 ifeq ($(ARCH), AIX)
 $(SO_LIB): $(OBJS)
@@ -102,6 +101,8 @@
 $(SO_LIB): $(OBJS)
 	rm -f $@
 	$(LINK_DLL) $(OBJS) $(DEPLIBS)
+	cd $(OBJLIBDIR); ln -s $(SO_NAME)$(SO_EXT) $(SO_NAME)$(SO_COREEXT)
+	cd $(OBJLIBDIR); ln -s $(SO_NAME)$(SO_EXT) $(SO_NAME)$(SO_COREEXT).$(ADMSDK_SO_MAJORVERSION)
 endif
 endif
 


Index: admsslutil.c
===================================================================
RCS file: /cvs/dirsec/adminutil/lib/libadmsslutil/admsslutil.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- admsslutil.c	20 Jul 2005 22:51:33 -0000	1.1.1.1
+++ admsslutil.c	6 Dec 2005 18:38:42 -0000	1.2
@@ -37,6 +37,7 @@
 #include "errno.h"
 #include "secport.h"
 #include "libadmsslutil/certmgt.h"
+#include "version.h"
 
 #define ADMSSL_BUF_LEN 1024
 
@@ -50,6 +51,19 @@
 
 #define SECURITY_ATTR "configuration.nsServerSecurity"
 
+#ifdef XP_UNIX
+/*
+ * Version information for the 'ident' and 'what commands
+ *
+ * NOTE: the first component of the concatenated rcsid string
+ * must not end in a '$' to prevent rcs keyword substitution.
+ */
+static char rcsid[] = "$Header: AdminUtil " ADMSDK_PRODUCT  
+        "  " ADMSDK_BUILDNUM " $";
+static char sccsid[] = "@(#)AdminUtil " ADMSDK_PRODUCT  
+		"  " ADMSDK_BUILDNUM;
+#endif /* XP_UNIX */
+
 void servssl_error(char *fmt, ...);
 
 char custom_file[BIG_LINE] = "";