GNOME.org
 

gnome-pilot r1553 - in trunk: . capplet gpilotd po utils

Author: mcdavey
Date: Tue Oct  7 07:33:38 2008
New Revision: 1553
URL: http://svn.gnome.org/viewvc/gnome-pilot?rev=1553&view=rev

Log:
2008-10-07  Matt Davey  <mcdavey mrao cam ac uk>
	* po/POTFILES.in: move libgpilotdcm into gpilotd/ dir,
		to fix long standing build order bug that was
		caused by circular dependencies (#508262)
	* po/POTFILES.skip: ditto
	* configure.in: ditto
	* capplet/Makefile.am: ditto
	* capplet/pilot.h: ditto
	* utils/gpilotdcm-client.c: ditto
	* utils/Makefile.am: ditto
	* gpilotd/gpilotd.c: ditto
	* gpilotd/manager.c: ditto
	* gpilotd/Makefile.am: ditto
	* Makefile.am: ditto
	* libgpilotdcm/gnome-pilot-conduit-config.gob: moved to gpilotd/
	* libgpilotdcm/gnome-pilot-conduit-management.gob: ditto
	* libgpilotdcm/Makefile.am: removed



Added:
   trunk/gpilotd/gnome-pilot-conduit-config.gob
      - copied, changed from r1547, /trunk/libgpilotdCM/gnome-pilot-conduit-config.gob
   trunk/gpilotd/gnome-pilot-conduit-management.gob
      - copied unchanged from r1547, /trunk/libgpilotdCM/gnome-pilot-conduit-management.gob
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/capplet/Makefile.am
   trunk/capplet/pilot.h
   trunk/configure.in
   trunk/gpilotd/Makefile.am
   trunk/gpilotd/gpilotd.c
   trunk/gpilotd/manager.c
   trunk/po/POTFILES.in
   trunk/po/POTFILES.skip
   trunk/utils/Makefile.am
   trunk/utils/gpilotdcm-client.c

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Tue Oct  7 07:33:38 2008
@@ -3,7 +3,6 @@
 SUBDIRS = 			\
 	po 			\
 	idl 			\
-	libgpilotdCM 		\
 	gpilotd 		\
 	applet			\
 	capplet 		\

Modified: trunk/capplet/Makefile.am
==============================================================================
--- trunk/capplet/Makefile.am	(original)
+++ trunk/capplet/Makefile.am	Tue Oct  7 07:33:38 2008
@@ -34,7 +34,7 @@
 gpilotd_control_applet_LDADD = \
 	$(top_builddir)/gpilotd/libgpilotd.la 			\
 	$(top_builddir)/gpilotd/libgpilotdconduit.la    	\
-	$(top_builddir)/libgpilotdCM/libgpilotdcm.la    	\
+	$(top_builddir)/gpilotd/libgpilotdcm.la    	\
 	$(GNOME_PILOT_LIBS) 					\
 	$(NULL)
 

Modified: trunk/capplet/pilot.h
==============================================================================
--- trunk/capplet/pilot.h	(original)
+++ trunk/capplet/pilot.h	Tue Oct  7 07:33:38 2008
@@ -27,8 +27,8 @@
 
 #include <gpilotd/gnome-pilot-structures.h>
 #include <gpilotd/gnome-pilot-conduit.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
+#include <gpilotd/gnome-pilot-conduit-management.h>
+#include <gpilotd/gnome-pilot-conduit-config.h>
 
 typedef struct _ConduitState ConduitState;
 struct _ConduitState {

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Oct  7 07:33:38 2008
@@ -275,7 +275,6 @@
 capplet/Makefile
 utils/Makefile
 idl/Makefile
-libgpilotdCM/Makefile
 po/Makefile.in
 help/Makefile
 help/C/Makefile

Modified: trunk/gpilotd/Makefile.am
==============================================================================
--- trunk/gpilotd/Makefile.am	(original)
+++ trunk/gpilotd/Makefile.am	Tue Oct  7 07:33:38 2008
@@ -9,6 +9,7 @@
 	-DGP_PILOT_LINK_VERSION=\"@PILOT_LINK_VERSION \" 	\
 	-DDEVICE_XML_DIR=\"$(datadir)/gnome-pilot\" 	\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		\
+	-DCONDUITDIR=\"$(datadir)\"				\
 	$(GNOME_PILOT_CFLAGS)	
 
 gpmarshal.h: gpmarshal.list
@@ -31,8 +32,21 @@
 	libgpilotdconduit.la 		\
 	$(NULL)
 
+gpilotdcmlibsdir=$(libdir)/
+
+gpilotdcmlibs_LTLIBRARIES =		\
+	libgpilotdcm.la
+
 ## GOB STUFF 
 
+GOB_LIBGPILOTDCM_BUILT_SRCS = 					\
+	gnome-pilot-conduit-management.c 		\
+	gnome-pilot-conduit-management-private.h 	\
+	gnome-pilot-conduit-management.h 		\
+	gnome-pilot-conduit-config.c			\
+	gnome-pilot-conduit-config-private.h 		\
+	gnome-pilot-conduit-config.h
+
 GOB_LIBGPILOTD_BUILT_SRCS = 			\
 	gnome-pilot-client.c 			\
 	gnome-pilot-client-private.h 		\
@@ -55,11 +69,14 @@
 	$(NULL)
 
 GOB_BUILT_SRCS = 			\
+	$(GOB_LIBGPILOTDCM_BUILT_SRCS) 	\
 	$(GOB_LIBGPILOTD_BUILT_SRCS) 	\
 	$(GOB_GPILOTD_CONDUIT_SRCS)	\
 	$(NULL)
 
 gobfiles = 						\
+	$(srcdir)/gnome-pilot-conduit-management.gob 	\
+	$(srcdir)/gnome-pilot-conduit-config.gob 	\
 	$(srcdir)/gnome-pilot-client.gob 		\
 	$(srcdir)/gnome-pilot-conduit.gob		\
 	$(srcdir)/gnome-pilot-conduit-backup.gob	\
@@ -99,6 +116,24 @@
 CLEANFILES = $(CORBA_SRCLIST) $(server_DATA)
 MAINTAINERCLEANFILES = $(GOB_BUILT_SRCS)
 
+## LIBGPILOTDCM
+
+libgpilotdcm_la_SOURCES = \
+	$(GOB_LIBGPILOTDCM_BUILT_SRCS)
+
+libgpilotdcmincludedir = $(includedir)/gpilotd
+
+libgpilotdcminclude_HEADERS = \
+	gnome-pilot-conduit-management.h 	\
+	gnome-pilot-conduit-config.h
+
+libgpilotdcm_la_LIBADD =		\
+	$(GNOME_PILOT_LIBS)		\
+	$(NULL)
+
+libgpilotdcm_la_LDFLAGS = \
+	-version-info $(GPILOTD_CM_CURRENT):$(GPILOTD_CM_REVISION):$(GPILOTD_CM_AGE)
+
 ## LIBGPILOTD
 
 libgpilotd_la_SOURCES = 		\
@@ -175,7 +210,7 @@
 gpilotd_LDFLAGS = -export-dynamic
 
 gpilotd_LDADD = libgpilotdconduit.la libgpilotd.la	\
-		../libgpilotdCM/libgpilotdcm.la 	\
+		./libgpilotdcm.la 	\
 		./libgpilotd.la				\
 		$(GNOME_PILOT_LIBS) 			\
 		$(NULL)

Copied: trunk/gpilotd/gnome-pilot-conduit-config.gob (from r1547, /trunk/libgpilotdCM/gnome-pilot-conduit-config.gob)
==============================================================================
--- /trunk/libgpilotdCM/gnome-pilot-conduit-config.gob	(original)
+++ trunk/gpilotd/gnome-pilot-conduit-config.gob	Tue Oct  7 07:33:38 2008
@@ -26,7 +26,7 @@
 #include <glib.h>
 #include <gtk/gtkobject.h>
 #include <gpilotd/gnome-pilot-conduit.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
+#include <gpilotd/gnome-pilot-conduit-management.h>
 #include <gmodule.h>
 %}
 

Modified: trunk/gpilotd/gpilotd.c
==============================================================================
--- trunk/gpilotd/gpilotd.c	(original)
+++ trunk/gpilotd/gpilotd.c	Tue Oct  7 07:33:38 2008
@@ -74,7 +74,7 @@
 #include "gpilot-gui.h"
 #include "gnome-pilot-conduit-backup.h"
 
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
+#include "gnome-pilot-conduit-management.h"
 
 static GPilotContext *context = NULL;
 

Modified: trunk/gpilotd/manager.c
==============================================================================
--- trunk/gpilotd/manager.c	(original)
+++ trunk/gpilotd/manager.c	Tue Oct  7 07:33:38 2008
@@ -45,8 +45,8 @@
 #include "gnome-pilot-dbinfo.h"
 #include "gpilot-gui.h"
 
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
+#include "gnome-pilot-conduit-management.h"
+#include "gnome-pilot-conduit-config.h"
 
 #define GPCM_LABEL "conduit_mgmt"
 #define GPCC_LABEL "conduit_cfg"

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Tue Oct  7 07:33:38 2008
@@ -21,7 +21,9 @@
 conduits/file/gpilot_install_file.c
 gpilotd/GNOME_Pilot_Daemon.server.in.in
 gpilotd/gnome-pilot-client.gob
+gpilotd/gnome-pilot-conduit-config.gob
 gpilotd/gnome-pilot-conduit-file.gob
+gpilotd/gnome-pilot-conduit-management.gob
 gpilotd/gnome-pilot-conduit-standard-abs.c
 gpilotd/gnome-pilot-conduit-standard-abs.h
 gpilotd/gnome-pilot-conduit-standard.gob
@@ -39,7 +41,5 @@
 gpilotd/orbit_daemon_glue.h
 gpilotd/queue_io.c
 gpilotd/queue_io.h
-libgpilotdCM/gnome-pilot-conduit-config.gob
-libgpilotdCM/gnome-pilot-conduit-management.gob
 utils/gpilotd-client.c
 utils/gpilotdcm-client.c

Modified: trunk/po/POTFILES.skip
==============================================================================
--- trunk/po/POTFILES.skip	(original)
+++ trunk/po/POTFILES.skip	Tue Oct  7 07:33:38 2008
@@ -2,4 +2,4 @@
 gpilot-fileman/multifile.c
 gpilot-fileman/pilotfunc.c
 gpilot-fileman/preferences.c
-libgpilotdCM/gnome-pilot-conduit-management.c
+gpilotd/gnome-pilot-conduit-management.c

Modified: trunk/utils/Makefile.am
==============================================================================
--- trunk/utils/Makefile.am	(original)
+++ trunk/utils/Makefile.am	Tue Oct  7 07:33:38 2008
@@ -21,5 +21,5 @@
 gpilotdcm_client_LDADD = 					\
 	$(top_builddir)/gpilotd/libgpilotdconduit.la	 	\
 	$(top_builddir)/gpilotd/libgpilotd.la			\
-	$(top_builddir)/libgpilotdCM/libgpilotdcm.la 		\
+	$(top_builddir)/gpilotd/libgpilotdcm.la 		\
 	$(GNOME_PILOT_LIBS)

Modified: trunk/utils/gpilotdcm-client.c
==============================================================================
--- trunk/utils/gpilotdcm-client.c	(original)
+++ trunk/utils/gpilotdcm-client.c	Tue Oct  7 07:33:38 2008
@@ -8,8 +8,8 @@
 #include <gnome.h>
 #include <bonobo-activation/bonobo-activation.h>
 
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
+#include <gpilotd/gnome-pilot-conduit-management.h>
+#include <gpilotd/gnome-pilot-conduit-config.h>
 
 int     arg_listconduits,
 	arg_listconduitsstate,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]