Versioning



First patch versions the installed libraries so that we can follow
standard libtool practices.

Second patch removes versioning from the conduits because they never
need it.

-JP
-- 
--
=======================================================================
JP Rosevear				jpr ximian com
Ximian Inc.				http://www.ximian.com
? gp-lib-ver-patch.diff
? libgpilotdCM/gnome-pilot-conduit.c
? libgpilotdCM/gnome-pilot-conduit.h
? libgpilotdCM/gnome-pilot-conduit-private.h
? macros/macros.dep
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-pilot/ChangeLog,v
retrieving revision 1.168
diff -u -r1.168 ChangeLog
--- ChangeLog	2001/08/02 11:14:34	1.168
+++ ChangeLog	2001/08/23 22:54:41
@@ -1,3 +1,11 @@
+2001-08-23  JP Rosevear  <jpr ximian com>
+
+	* configure.in: Variables for library versioning
+
+	* gpilotd/Makefile.am: version libs
+
+	* libgpilotdCM/Makefile.am: version libs	
+	
 2001-08-02  Eskil Heyn Olsen  <eskil eskil dk>
 
 	* configure.in:
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnome-pilot/configure.in,v
retrieving revision 1.131
diff -u -r1.131 configure.in
--- configure.in	2001/08/02 08:47:20	1.131
+++ configure.in	2001/08/23 22:54:41
@@ -14,6 +14,17 @@
 GNOME_PILOT_VERSION="$GNOME_PILOT_MAJOR.$GNOME_PILOT_REVISION.$GNOME_PILOT_PATCHLEVEL"
 VERSION="$GNOME_PILOT_MAJOR.$GNOME_PILOT_REVISION.$GNOME_PILOT_PATCHLEVEL"
 
+dnl
+dnl take care of library versioning
+dnl
+GNOME_PILOT_CURRENT=1
+GNOME_PILOT_REVISION=0
+GNOME_PILOT_AGE=0
+
+AC_SUBST(GNOME_PILOT_CURRENT)
+AC_SUBST(GNOME_PILOT_REVISION)
+AC_SUBST(GNOME_PILOT_AGE)
+
 AM_INIT_AUTOMAKE(gnome-pilot, [$VERSION])
 
 AM_ACLOCAL_INCLUDE(macros)
Index: gpilotd/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-pilot/gpilotd/Makefile.am,v
retrieving revision 1.70
diff -u -r1.70 Makefile.am
--- gpilotd/Makefile.am	2001/07/30 21:31:37	1.70
+++ gpilotd/Makefile.am	2001/08/23 22:54:41
@@ -102,6 +102,9 @@
 
 libgpilotdinclude_HEADERS = gnome-pilot-client.h
 
+libgpilotd_la_LDFLAGS = \
+	-version-info $(GNOME_PILOT_CURRENT):$(GNOME_PILOT_REVISION):$(GNOME_PILOT_AGE)
+
 ## LIBGPILOTDCONDUIT
 libgpilotdconduit_la_SOURCES = 			\
 	gnome-pilot-conduit-standard-abs.c 	\
@@ -122,6 +125,9 @@
 	$(NULL)
 
 libgpilotdconduitincludedir = $(includedir)/gpilotd
+
+libgpilotdconduit_la_LDFLAGS = \
+	-version-info $(GNOME_PILOT_CURRENT):$(GNOME_PILOT_REVISION):$(GNOME_PILOT_AGE)
 
 ###
 
Index: libgpilotdCM/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-pilot/libgpilotdCM/Makefile.am,v
retrieving revision 1.13
diff -u -r1.13 Makefile.am
--- libgpilotdCM/Makefile.am	2001/07/30 21:31:38	1.13
+++ libgpilotdCM/Makefile.am	2001/08/23 22:54:41
@@ -43,5 +43,8 @@
 	gnome-pilot-conduit-management.h 	\
 	gnome-pilot-conduit-config.h
 
+libgpilotdcm_la_LDFLAGS = \
+	-version-info $(GNOME_PILOT_CURRENT):$(GNOME_PILOT_REVISION):$(GNOME_PILOT_AGE)
+
 EXTRA_DIST = 		\
 	$(gobfiles)
? gp-no-version-patch.diff
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-pilot/ChangeLog,v
retrieving revision 1.168
diff -u -r1.168 ChangeLog
--- ChangeLog	2001/08/02 11:14:34	1.168
+++ ChangeLog	2001/08/23 20:22:12
@@ -1,3 +1,8 @@
+2001-08-23  JP Rosevear  <jpr ximian com>
+
+	* conduits/*: disable the versioning information on the shared
+	libraries since we never need it
+
 2001-08-02  Eskil Heyn Olsen  <eskil eskil dk>
 
 	* configure.in:
Index: conduits/backup/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-pilot/conduits/backup/Makefile.am,v
retrieving revision 1.27
diff -u -r1.27 Makefile.am
--- conduits/backup/Makefile.am	2001/03/01 20:20:49	1.27
+++ conduits/backup/Makefile.am	2001/08/23 20:22:12
@@ -14,9 +14,10 @@
 
 libbackup_conduit_la_SOURCES = backup_conduit.c backup_conduit.h 
 
+libbackup_conduit_la_LDFLAGS = -module -avoid-version
 libbackup_conduit_la_LIBADD = 	\
 	$(PISOCK_LIBS) 		\
-	$(GNOME_LIBDIR)		 \
+	$(GNOME_LIBDIR)		\
 	$(GNOME_LIBS)
 
 backup.conduit: backup.conduit.in Makefile
Index: conduits/file/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-pilot/conduits/file/Makefile.am,v
retrieving revision 1.27
diff -u -r1.27 Makefile.am
--- conduits/file/Makefile.am	2001/05/12 03:10:34	1.27
+++ conduits/file/Makefile.am	2001/08/23 20:22:12
@@ -15,6 +15,7 @@
 
 libfile_conduit_la_SOURCES = file_conduit.c file_conduit.h palm.keys.in
 
+libfile_conduit_la_LDFLAGS = -module -avoid-version
 libfile_conduit_la_LIBADD = 		\
 	$(PISOCK_LIBS) 			\
 	$(GNOME_LIBDIR) 		\
Index: conduits/test/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-pilot/conduits/test/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- conduits/test/Makefile.am	2001/03/01 22:35:32	1.7
+++ conduits/test/Makefile.am	2001/08/23 20:22:12
@@ -15,6 +15,7 @@
 libtest_conduit_la_SOURCES = 	\
 	test_conduit.c
 
+libtest_conduit_la_LDFLAGS = -module -avoid-version
 libtest_conduit_la_LIBADD = 	\
 	$(GNOME_LIBDIR) 	\
 	$(GNOME_LIBS) 		\


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]