[Fedora-directory-commits] adminutil/lib/libadminutil Makefile, 1.3, 1.4 admutil.c, 1.1.1.1, 1.2

[Noriko Hosoi (nhosoi)]

Author: nhosoi

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

Modified Files:
	Makefile admutil.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/libadminutil/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile	9 Nov 2005 07:16:40 -0000	1.3
+++ Makefile	6 Dec 2005 18:38:37 -0000	1.4
@@ -28,35 +28,33 @@
 
 include ../../nsdefs.mk
 
-OBJDEST=$(OBJDIR)/lib/libadminutil
+OBJLIBDIR=$(OBJDIR)/lib
+OBJDEST=$(OBJLIBDIR)/libadminutil
 
 ifeq ($(ARCH), WINNT)
   ifeq ($(DEBUG), fulld)
-    LIBS=$(OBJDIR)/lib/libadminutild_s$(ADMSDK_SO_VERSION).lib
-    SO_NAME=$(OBJDIR)/lib/libadminutild$(ADMSDK_SO_VERSION)
+    LIBS=$(OBJLIBDIR)/libadminutild_s$(ADMSDK_SO_VERSION).lib
+    SO_NAME=libadminutild
   else
-    LIBS=$(OBJDIR)/lib/libadminutil_s$(ADMSDK_SO_VERSION).lib
-    SO_NAME=$(OBJDIR)/lib/libadminutil$(ADMSDK_SO_VERSION)
+    LIBS=$(OBJLIBDIR)/libadminutil_s$(ADMSDK_SO_VERSION).lib
+    SO_NAME=libadminutil
   endif
 else
-  LIBS=$(OBJDIR)/lib/libadminutil$(ADMSDK_SO_VERSION).a
-  SO_NAME=$(OBJDIR)/lib/libadminutil$(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)/libadminutil-$(ADMSDK_SO_DOTVERSION).a
+  SO_NAME=libadminutil
 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
 LDAPLINK=-L$(LDAP_LIBPATH) $(addprefix -l, $(LDAP_SOLIB_NAMES)) $(addprefix -l, $(LDAP_SSLLIB_NAMES))
 endif
 
@@ -76,26 +74,27 @@
                               errRpt.o form_post.o strlist.o \
 			      resource.o uginfo.o $(OSOBJS))
 
-all: $(OBJDEST) $(LIBS) $(SO_LIB) resource_bundle
+all: $(OBJDEST) $(SO_LIB) resource_bundle
 
 $(OBJDEST):
-	echo $(LIBS)
 	echo $(SO_LIB)
 	mkdir -p $(OBJDEST)
 
-ifeq ($(ARCH), WINNT)
-$(LIBS): $(OBJS)
-	rm -f $@
-	$(AR) $(OBJS)
-	$(RANLIB) $@
-else
-$(LIBS): $(OBJS)
-	rm -f $@
-	$(AR) $(OBJS)
-	$(RANLIB) $@
+# stop building static libraries
+#ifeq ($(ARCH), WINNT)
+#$(LIBS): $(OBJS)
+#	rm -f $@
+#	$(AR) $(OBJS)
+#	$(RANLIB) $@
+#else
+#$(LIBS): $(OBJS)
+#	rm -f $@
+#	$(AR) $(OBJS)
+#	$(RANLIB) $@
+#endif
 
-endif
 ifeq ($(ARCH), AIX)
+ADM_EXPORT_FILE=$(OBJLIBDIR)/$(SO_NAME)$(DLL_PRESUF).exp
 $(SO_LIB): $(OBJS)
 	nm -B -C -g $(OBJS) \
 			| awk '/ [T,D,B] / {print $$3}' \
@@ -114,6 +113,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: admutil.c
===================================================================
RCS file: /cvs/dirsec/adminutil/lib/libadminutil/admutil.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- admutil.c	20 Jul 2005 22:51:32 -0000	1.1.1.1
+++ admutil.c	6 Dec 2005 18:38:37 -0000	1.2
@@ -22,12 +22,27 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include "version.h"
 #include "admutil_pvt.h"
 
 #ifdef XP_WIN32
 #define strcasecmp stricmp
 #define strncasecmp _strnicmp
 #endif
+
+#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 */
+
  
 /* Max size for a pathname */
 #ifndef PATH_MAX