[nautilus-actions: 3/19] Fix make distcheck

[Pierre Wieser <pwieser src gnome org>]

commit 96ecfbfe665414dc1ec33e8ce8dd7778c2445d19
Author: Pierre Wieser <pwieser trychlos org>
Date:   Sat Jun 6 11:34:08 2009 +0200

    Fix make distcheck
---
 ChangeLog                                    |    8 ++++++++
 src/common/Makefile.am                       |    4 ++--
 src/common/nact-action-profile.c             |    2 +-
 src/common/nact-action.c                     |    2 +-
 src/common/nact-gconf.c                      |    2 +-
 src/common/nact-object.c                     |    2 +-
 src/common/nact-pivot.c                      |    2 +-
 src/common/{uti-lists.c => nact-uti-lists.c} |    2 +-
 src/common/{uti-lists.h => nact-uti-lists.h} |    6 +++---
 src/nact/Makefile.am                         |    8 ++++----
 src/plugin/Makefile.am                       |    2 +-
 src/utils/Makefile.am                        |    2 +-
 12 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0cf1dfb..2500c74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2009-06-06 Pierre Wieser <pwieser trychlos org>
 
 	Remove NactIIOClient interface.
+	Fix make distcheck.
+	Fix Glade file adressing.
 
 	* src/common/nact-iio-client.c:
 	* src/common/nact-iio-client.h:
@@ -19,8 +21,14 @@
 	* src/common/nact-iio-provider.h:
 	* src/common/nact-pivot.c:
 	* src/common/nact-pivot.h:
+	* src/nact/Makefile.am:
+	* src/utils/Makefile.am:
 	Updated accordingly.
 
+	* src/common/nact-uti-lists.c:
+	* src/common/nact-uti-lists.h:
+	New files after renaming previous uti-lists.{c,h}.
+
 2009-06-05 Pierre Wieser <pwieser trychlos org>
 
 	Create pivot data structure NactPivotValue
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index ad56004..6f30488 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -48,6 +48,8 @@ libnact_la_SOURCES = \
 	nact-object.h								\
 	nact-pivot.c								\
 	nact-pivot.h								\
+	nact-uti-lists.c							\
+	nact-uti-lists.h							\
 	nautilus-actions-config.c					\
 	nautilus-actions-config.h					\
 	nautilus-actions-config-gconf.c				\
@@ -61,8 +63,6 @@ libnact_la_SOURCES = \
 	nautilus-actions-config-schema-writer.h		\
 	nautilus-actions-config-schema-reader.c		\
 	nautilus-actions-config-schema-reader.h		\
-	uti-lists.c									\
-	uti-lists.h									\
 	$(NULL)
 
 libnact_la_LIBADD = -lxml2 -luuid
diff --git a/src/common/nact-action-profile.c b/src/common/nact-action-profile.c
index 54d70f7..c4b65ca 100644
--- a/src/common/nact-action-profile.c
+++ b/src/common/nact-action-profile.c
@@ -38,7 +38,7 @@
 
 #include "nact-action.h"
 #include "nact-action-profile.h"
-#include "uti-lists.h"
+#include "nact-uti-lists.h"
 
 struct NactActionProfilePrivate {
 	gboolean  dispose_has_run;
diff --git a/src/common/nact-action.c b/src/common/nact-action.c
index 22c018a..61addad 100644
--- a/src/common/nact-action.c
+++ b/src/common/nact-action.c
@@ -36,7 +36,7 @@
 
 #include "nact-action.h"
 #include "nact-action-profile.h"
-#include "uti-lists.h"
+#include "nact-uti-lists.h"
 
 struct NactActionPrivate {
 	gboolean  dispose_has_run;
diff --git a/src/common/nact-gconf.c b/src/common/nact-gconf.c
index b69ea1e..9939eb4 100644
--- a/src/common/nact-gconf.c
+++ b/src/common/nact-gconf.c
@@ -42,7 +42,7 @@
 #include "nact-gconf.h"
 #include "nact-gconf-keys.h"
 #include "nact-iio-provider.h"
-#include "uti-lists.h"
+#include "nact-uti-lists.h"
 
 struct NactGConfPrivate {
 	gboolean     dispose_has_run;
diff --git a/src/common/nact-object.c b/src/common/nact-object.c
index 20c7f92..b13b6d4 100644
--- a/src/common/nact-object.c
+++ b/src/common/nact-object.c
@@ -33,7 +33,7 @@
 #endif
 
 #include "nact-object.h"
-#include "uti-lists.h"
+#include "nact-uti-lists.h"
 
 struct NactObjectPrivate {
 	gboolean dispose_has_run;
diff --git a/src/common/nact-pivot.c b/src/common/nact-pivot.c
index 45fe1d0..25803ce 100644
--- a/src/common/nact-pivot.c
+++ b/src/common/nact-pivot.c
@@ -36,7 +36,7 @@
 #include "nact-gconf.h"
 #include "nact-pivot.h"
 #include "nact-iio-provider.h"
-#include "uti-lists.h"
+#include "nact-uti-lists.h"
 
 /* action_changed_cb send events which are stacked in a static GSList
  * we so hope to optimize updating the global list of actions
diff --git a/src/common/uti-lists.c b/src/common/nact-uti-lists.c
similarity index 98%
rename from src/common/uti-lists.c
rename to src/common/nact-uti-lists.c
index c72072a..3ac6c11 100644
--- a/src/common/uti-lists.c
+++ b/src/common/nact-uti-lists.c
@@ -32,7 +32,7 @@
 #include <config.h>
 #endif
 #include <glib-object.h>
-#include "uti-lists.h"
+#include "nact-uti-lists.h"
 
 /**
  * Free a GSList of GObjects.
diff --git a/src/common/uti-lists.h b/src/common/nact-uti-lists.h
similarity index 94%
rename from src/common/uti-lists.h
rename to src/common/nact-uti-lists.h
index 9a8dd2b..42772d3 100644
--- a/src/common/uti-lists.h
+++ b/src/common/nact-uti-lists.h
@@ -28,8 +28,8 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NACTUTI_LISTS_H__
-#define __NACTUTI_LISTS_H__
+#ifndef __NACT_UTI_LISTS_H__
+#define __NACT_UTI_LISTS_H__
 
 /*
  * Some functions to ease the GSList list manipulations.
@@ -46,4 +46,4 @@ void     nactuti_free_string_list( GSList *list );
 
 G_END_DECLS
 
-#endif /* __NACTUTI_LISTS_H__ */
+#endif /* __NACT_UTI_LISTS_H__ */
diff --git a/src/nact/Makefile.am b/src/nact/Makefile.am
index 4a8f733..a01e716 100644
--- a/src/nact/Makefile.am
+++ b/src/nact/Makefile.am
@@ -29,10 +29,12 @@
 bin_PROGRAMS = \
 	nautilus-actions-config
 
+gladedir = $(datadir)/nautilus-actions
+
 AM_CPPFLAGS += \
-	-I $(top_srcdir)									\
+	-I $(top_srcdir)/src								\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"			\
-	-DGLADEDIR=\""$(datadir)/nautilus-actions/nact"\"	\
+	-DGLADEDIR=\"$(gladedir)\"							\
 	$(NAUTILUS_ACTIONS_CFLAGS)							\
 	$(NULL)
 
@@ -58,8 +60,6 @@ nautilus_actions_config_LDADD = \
 	$(NAUTILUS_ACTIONS_LIBS)							\
 	$(NULL)
 
-gladedir = $(datadir)/nautilus-actions
-
 glade_DATA = nautilus-actions-config.glade
 
 @INTLTOOL_DESKTOP_RULE@
diff --git a/src/plugin/Makefile.am b/src/plugin/Makefile.am
index 6a8f3de..1e40bea 100644
--- a/src/plugin/Makefile.am
+++ b/src/plugin/Makefile.am
@@ -27,7 +27,7 @@
 #   ... and many others (see AUTHORS)
 
 AM_CPPFLAGS += \
-	-I $(top_srcdir)									\
+	-I $(top_srcdir)/src								\
 	-DG_LOG_DOMAIN=\"nact\"								\
 	$(NAUTILUS_ACTIONS_CFLAGS)							\
 	$(NULL)
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 45d1058..0facd7e 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -32,7 +32,7 @@ bin_PROGRAMS = \
 	$(NULL)
 
 AM_CPPFLAGS += \
-	-I $(top_srcdir)							\
+	-I $(top_srcdir)/src						\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	$(NAUTILUS_ACTIONS_UTILS_CFLAGS)			\
 	$(NULL)