GNOME.org
 

[gnome-pilot/gtk3: 5/6] append "-3.0" to library names, to allow parallel installs with gtk2 versions.

commit 79c8a2be32b36f2ba4dd6f34a1317a5dea77e642
Author: Matt Davey <mcdavey mrao cam ac uk>
Date:   Sat Jan 29 22:41:56 2011 +0000

    append "-3.0" to library names, to allow parallel installs with gtk2 versions.

 .gitignore                                 |    2 +-
 ChangeLog                                  |    4 ++-
 capplet/Makefile.am                        |    6 ++--
 conduits/backup/Makefile.am                |   10 ++++----
 conduits/evolution-data-server/Makefile.am |   32 ++++++++++++++--------------
 conduits/file/Makefile.am                  |   12 +++++-----
 conduits/test/Makefile.am                  |   10 ++++----
 gpilotd/Makefile.am                        |   30 ++++++++++++--------------
 utils/Makefile.am                          |    8 +++---
 9 files changed, 57 insertions(+), 57 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 46ff61d..62654a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,7 +43,7 @@ po/.intltool-merge-cache
 po/gnome-pilot.pot
 po/POTFILES
 stamp-h1
-gnome-pilot-2.0.pc
+gnome-pilot-3.0.pc
 gnome-pilot.spec
 applet/GNOME_PilotApplet.server
 applet/gpilot-applet
diff --git a/ChangeLog b/ChangeLog
index f48aa50..6fcef79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 2011-01-29  Matt Davey <mcdavey mrao cam ac uk>
        * gtk3 branch.
-       * configure.ac: bump libraries to v3.  Update all dependencies.
+       * configure.ac and various Makefile.am: bump libraries to v3.
+	  Update all dependencies to gtk3 versions.
 	  Require pilot-link 0.12, remove hal option, require gudev,
+	  rename libraries to append "-3.0", and reset libversions to 0.0.0.
        * gnome-pilot-3.0.pc.in: renamed from gnome-pilot-2.0.pc.in
        * Makefile.am: reference gnome-pilot-3.0.pc
        * various: remove PILOT_LINK_0_12 #defines.  Ancient history
diff --git a/capplet/Makefile.am b/capplet/Makefile.am
index ea65d00..2f86a65 100644
--- a/capplet/Makefile.am
+++ b/capplet/Makefile.am
@@ -34,9 +34,9 @@ gpilotd_control_applet_LDFLAGS = \
 	-export-dynamic
 
 gpilotd_control_applet_LDADD = \
-	$(top_builddir)/gpilotd/libgpilotd.la 			\
-	$(top_builddir)/gpilotd/libgpilotdconduit.la    	\
-	$(top_builddir)/gpilotd/libgpilotdcm.la    	\
+	$(top_builddir)/gpilotd/libgpilotd-3.0.la 			\
+	$(top_builddir)/gpilotd/libgpilotdconduit-3.0.la    	\
+	$(top_builddir)/gpilotd/libgpilotdcm-3.0.la    	\
 	$(GNOME_PILOT_LIBS) 					\
 	$(NULL)
 
diff --git a/conduits/backup/Makefile.am b/conduits/backup/Makefile.am
index 836984f..b2a436f 100644
--- a/conduits/backup/Makefile.am
+++ b/conduits/backup/Makefile.am
@@ -7,14 +7,14 @@ AM_CPPFLAGS = 					\
 backup_conduitsdir=$(libdir)/gnome-pilot/conduits
 
 backup_conduits_LTLIBRARIES = \
-	libbackup_conduit.la
+	libbackup_conduit-3.0.la
 
-libbackup_conduit_la_SOURCES = backup_conduit.c backup_conduit.h 
+libbackup_conduit_3_0_la_SOURCES = backup_conduit.c backup_conduit.h 
 
-libbackup_conduit_la_LDFLAGS = -module -avoid-version
-libbackup_conduit_la_LIBADD = 	\
+libbackup_conduit_3_0_la_LDFLAGS = -module -avoid-version
+libbackup_conduit_3_0_la_LIBADD = 	\
 	$(GNOME_PILOT_LIBS) \
-	$(top_builddir)/gpilotd/libgpilotdconduit.la
+	$(top_builddir)/gpilotd/libgpilotdconduit-3.0.la
 
 @GP_CONDUIT_RULE@
 
diff --git a/conduits/evolution-data-server/Makefile.am b/conduits/evolution-data-server/Makefile.am
index f7c432e..786f835 100644
--- a/conduits/evolution-data-server/Makefile.am
+++ b/conduits/evolution-data-server/Makefile.am
@@ -2,10 +2,10 @@ moduledir = $(libdir)/gnome-pilot/conduits/
 conduitdir = $(datadir)/gnome-pilot/conduits/
 
 module_LTLIBRARIES = \
-	libeaddress_conduit.la \
-	libecalendar_conduit.la \
-	libememo_conduit.la \
-	libetodo_conduit.la
+	libeaddress_conduit-3.0.la \
+	libecalendar_conduit-3.0.la \
+	libememo_conduit-3.0.la \
+	libetodo_conduit-3.0.la
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
@@ -14,7 +14,7 @@ AM_CPPFLAGS = \
 	$(EVOLUTION_DATA_SERVER_CFLAGS) \
 	-DG_LOG_DOMAIN=\"eds-conduits\"
 
-libeaddress_conduit_la_SOURCES = \
+libeaddress_conduit_3_0_la_SOURCES = \
 	address-conduit.c \
 	e-dialog-widgets.c \
 	e-dialog-widgets.h \
@@ -25,14 +25,14 @@ libeaddress_conduit_la_SOURCES = \
 	e-pilot-util.c \
 	e-pilot-util.h
 
-libeaddress_conduit_la_LDFLAGS = \
+libeaddress_conduit_3_0_la_LDFLAGS = \
 	-module -avoid-version
 
-libeaddress_conduit_la_LIBADD = \
+libeaddress_conduit_3_0_la_LIBADD = \
 	$(GNOME_PILOT_LIBS) \
 	$(EVOLUTION_DATA_SERVER_LIBS)
 
-libecalendar_conduit_la_SOURCES = \
+libecalendar_conduit_3_0_la_SOURCES = \
 	calendar-conduit.c \
 	libecalendar-common-conduit.c \
 	libecalendar-common-conduit.h \
@@ -43,14 +43,14 @@ libecalendar_conduit_la_SOURCES = \
 	e-pilot-util.c \
 	e-pilot-util.h
 
-libecalendar_conduit_la_LDFLAGS = \
+libecalendar_conduit_3_0_la_LDFLAGS = \
 	-module -avoid-version
 
-libecalendar_conduit_la_LIBADD = \
+libecalendar_conduit_3_0_la_LIBADD = \
 	$(LIBECAL_LIBS) \
 	$(EVOLUTION_DATA_SERVER_LIBS)
 
-libememo_conduit_la_SOURCES = \
+libememo_conduit_3_0_la_SOURCES = \
 	memo-conduit.c \
 	libecalendar-common-conduit.c \
 	libecalendar-common-conduit.h \
@@ -61,14 +61,14 @@ libememo_conduit_la_SOURCES = \
 	e-pilot-util.c \
 	e-pilot-util.h
 
-libememo_conduit_la_LDFLAGS = \
+libememo_conduit_3_0_la_LDFLAGS = \
 	-module -avoid-version
 
-libememo_conduit_la_LIBADD = \
+libememo_conduit_3_0_la_LIBADD = \
 	$(LIBECAL_LIBS) \
 	$(EVOLUTION_DATA_SERVER_LIBS)
 
-libetodo_conduit_la_SOURCES = \
+libetodo_conduit_3_0_la_SOURCES = \
 	todo-conduit.c \
 	libecalendar-common-conduit.c \
 	libecalendar-common-conduit.h \
@@ -79,10 +79,10 @@ libetodo_conduit_la_SOURCES = \
 	e-pilot-util.c \
 	e-pilot-util.h
 
-libetodo_conduit_la_LDFLAGS = \
+libetodo_conduit_3_0_la_LDFLAGS = \
 	-module -avoid-version
 
-libetodo_conduit_la_LIBADD = \
+libetodo_conduit_3_0_la_LIBADD = \
 	$(GNOME_PILOT_LIBS) \
 	$(EVOLUTION_DATA_SERVER_LIBS)
 
diff --git a/conduits/file/Makefile.am b/conduits/file/Makefile.am
index 4783292..9feacad 100644
--- a/conduits/file/Makefile.am
+++ b/conduits/file/Makefile.am
@@ -10,14 +10,14 @@ AM_CPPFLAGS = 					\
 file_conduitsdir=$(libdir)/gnome-pilot/conduits
 
 file_conduits_LTLIBRARIES = \
-	libfile_conduit.la
+	libfile_conduit-3.0.la
 
-libfile_conduit_la_SOURCES = file_conduit.c file_conduit.h palm.keys.in
+libfile_conduit_3_0_la_SOURCES = file_conduit.c file_conduit.h palm.keys.in
 
-libfile_conduit_la_LDFLAGS = -module -avoid-version
-libfile_conduit_la_LIBADD = 		\
+libfile_conduit_3_0_la_LDFLAGS = -module -avoid-version
+libfile_conduit_3_0_la_LIBADD = 		\
 	$(GNOME_PILOT_LIBS)  \
-	$(top_builddir)/gpilotd/libgpilotdconduit.la
+	$(top_builddir)/gpilotd/libgpilotdconduit-3.0.la
 
 
 bin_PROGRAMS = gpilot-install-file
@@ -25,7 +25,7 @@ bin_PROGRAMS = gpilot-install-file
 gpilot_install_file_SOURCES = gpilot_install_file.c
 
 gpilot_install_file_LDADD = 					\
-		$(top_builddir)/gpilotd/libgpilotd.la 		\
+		$(top_builddir)/gpilotd/libgpilotd-3.0.la 		\
 		$(GNOME_PILOT_LIBS)
 
 @GP_CONDUIT_RULE@
diff --git a/conduits/test/Makefile.am b/conduits/test/Makefile.am
index bc2ab8f..173f08a 100644
--- a/conduits/test/Makefile.am
+++ b/conduits/test/Makefile.am
@@ -6,15 +6,15 @@ AM_CPPFLAGS = 			\
 test_conduitsdir=$(libdir)/gnome-pilot/conduits
 
 test_conduits_LTLIBRARIES = \
-	libtest_conduit.la
+	libtest_conduit-3.0.la
 
-libtest_conduit_la_SOURCES = 	\
+libtest_conduit_3_0_la_SOURCES = 	\
 	test_conduit.c
 
-libtest_conduit_la_LDFLAGS = -module -avoid-version
-libtest_conduit_la_LIBADD = 	\
+libtest_conduit_3_0_la_LDFLAGS = -module -avoid-version
+libtest_conduit_3_0_la_LIBADD = 	\
 	$(GNOME_PILOT_LIBS) \
-	$(top_builddir)/gpilotd/libgpilotdconduit.la
+	$(top_builddir)/gpilotd/libgpilotdconduit-3.0.la
 
 @GP_CONDUIT_RULE@
 
diff --git a/gpilotd/Makefile.am b/gpilotd/Makefile.am
index e64cde3..cba43cb 100644
--- a/gpilotd/Makefile.am
+++ b/gpilotd/Makefile.am
@@ -29,14 +29,14 @@ gpmarshal.c: gpmarshal.h
 gpilotdlibsdir=$(libdir)
 
 gpilotdlibs_LTLIBRARIES = 		\
-	libgpilotd.la 			\
-	libgpilotdconduit.la 		\
+	libgpilotd-3.0.la 			\
+	libgpilotdconduit-3.0.la 		\
 	$(NULL)
 
 gpilotdcmlibsdir=$(libdir)
 
 gpilotdcmlibs_LTLIBRARIES =		\
-	libgpilotdcm.la
+	libgpilotdcm-3.0.la
 
 ## MARSHAL STUFF
 
@@ -113,7 +113,7 @@ MAINTAINERCLEANFILES = $(GOB_BUILT_SRCS)
 
 ## LIBGPILOTDCM
 
-libgpilotdcm_la_SOURCES = \
+libgpilotdcm_3_0_la_SOURCES = \
 	$(GOB_LIBGPILOTDCM_BUILT_SRCS)
 
 libgpilotdcmincludedir = $(includedir)/gnome-pilot-3.0
@@ -122,16 +122,16 @@ libgpilotdcminclude_HEADERS = \
 	gnome-pilot-conduit-management.h 	\
 	gnome-pilot-conduit-config.h
 
-libgpilotdcm_la_LIBADD =		\
+libgpilotdcm_3_0_la_LIBADD =		\
 	$(GNOME_PILOT_LIBS)		\
 	$(NULL)
 
-libgpilotdcm_la_LDFLAGS = \
+libgpilotdcm_3_0_la_LDFLAGS = \
 	-version-info $(GPILOTD_CM_CURRENT):$(GPILOTD_CM_REVISION):$(GPILOTD_CM_AGE)
 
 ## LIBGPILOTD
 
-libgpilotd_la_SOURCES = 		\
+libgpilotd_3_0_la_SOURCES = 		\
 	$(GOB_LIBGPILOTD_BUILT_SRCS)	\
 	$(GPMARSHAL_BUILT_SRCS)	\
 	$(NULL)
@@ -140,15 +140,15 @@ libgpilotdincludedir = $(includedir)/gnome-pilot-3.0
 
 libgpilotdinclude_HEADERS = gnome-pilot-client.h
 
-libgpilotd_la_LIBADD = \
+libgpilotd_3_0_la_LIBADD = \
 	$(GNOME_PILOT_LIBS)	\
 	$(NONE)
 
-libgpilotd_la_LDFLAGS = \
+libgpilotd_3_0_la_LDFLAGS = \
 	-version-info $(GPILOTD_CURRENT):$(GPILOTD_REVISION):$(GPILOTD_AGE)
 
 ## LIBGPILOTDCONDUIT
-libgpilotdconduit_la_SOURCES = 			\
+libgpilotdconduit_3_0_la_SOURCES = 			\
 	$(GOB_GPILOTD_CONDUIT_SRCS)		\
         $(GPMARSHAL_BUILT_SRCS) \
 	gnome-pilot-conduit-standard-abs.c 	\
@@ -174,11 +174,11 @@ libgpilotdconduitinclude_HEADERS = 		\
 
 libgpilotdconduitincludedir = $(includedir)/gnome-pilot-3.0
 
-libgpilotdconduit_la_LIBADD =	\
+libgpilotdconduit_3_0_la_LIBADD =	\
 	$(GNOME_PILOT_LIBS)	\
 	$(NULL)
 
-libgpilotdconduit_la_LDFLAGS = \
+libgpilotdconduit_3_0_la_LDFLAGS = \
 	-version-info $(GPILOTD_CONDUIT_CURRENT):$(GPILOTD_CONDUIT_REVISION):$(GPILOTD_CONDUIT_AGE)
 
 ###
@@ -203,11 +203,9 @@ gpilotd_SOURCES =			\
 
 gpilotd_LDFLAGS = -export-dynamic
 
-gpilotd_LDADD = libgpilotdconduit.la libgpilotd.la	\
-		./libgpilotdcm.la 	\
-		./libgpilotd.la				\
+gpilotd_LDADD = libgpilotdconduit-3.0.la libgpilotd-3.0.la	\
+		./libgpilotdcm-3.0.la 	\
 		$(GNOME_PILOT_LIBS) 			\
-		$(HAL_LIBS) 				\
 		$(GUDEV_LIBS) 				\
 		$(NULL)
 
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 862a5f2..8850039 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -15,12 +15,12 @@ gnome_pilot_make_password_LDADD = 	\
 
 gpilotd_client_SOURCES = gpilotd-client.c
 gpilotd_client_LDADD = 				\
-	$(top_builddir)/gpilotd/libgpilotd.la 	\
+	$(top_builddir)/gpilotd/libgpilotd-3.0.la 	\
 	$(GNOME_PILOT_LIBS)
 
 gpilotdcm_client_SOURCES = gpilotdcm-client.c
 gpilotdcm_client_LDADD = 					\
-	$(top_builddir)/gpilotd/libgpilotdconduit.la	 	\
-	$(top_builddir)/gpilotd/libgpilotd.la			\
-	$(top_builddir)/gpilotd/libgpilotdcm.la 		\
+	$(top_builddir)/gpilotd/libgpilotdconduit-3.0.la	 	\
+	$(top_builddir)/gpilotd/libgpilotd-3.0.la			\
+	$(top_builddir)/gpilotd/libgpilotdcm-3.0.la 		\
 	$(GNOME_PILOT_LIBS)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]