[nautilus-actions] Cleanup Makefile.am
- From: Pierre Wieser <pwieser src gnome org>
- To: svn-commits-list gnome org
- Subject: [nautilus-actions] Cleanup Makefile.am
- Date: Thu, 28 May 2009 17:47:24 -0400 (EDT)
commit 6b7fe60a5b41fa49ee9a368168acbe070c5f27c2
Author: Pierre Wieser <pwieser trychlos org>
Date: Mon May 25 20:32:11 2009 +0200
Cleanup Makefile.am
---
ChangeLog | 7 +++++++
icons/Makefile.am | 11 ++++++-----
libnautilus-actions/Makefile.am | 6 ++++--
nact/Makefile.am | 12 ++++++++----
plugin/Makefile.am | 9 ++++++---
utils/Makefile.am | 15 ++++++++++-----
6 files changed, 41 insertions(+), 19 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f25a9eb..76320f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,13 @@
* Makefile.am:
Reorganize install order so that plugin be installed last.
+ * icons/Makefile.am:
+ * libnautilus-actions/Makefile.am:
+ * nact/Makefile.am:
+ * plugin/Makefile.am:
+ * utils/Makefile.am:
+ Cleanup Makefile.am.
+
2009-05-18 Pierre Wieser <pwieser trychlos org>
Fix Glade regression I introduced myself when ansi-fying C sources !
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 1e2995c..744b8a8 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -26,11 +26,12 @@
# ... and many others (see AUTHORS)
SUBDIRS = \
- 16x16 \
- 22x22 \
- 32x32 \
- 48x48 \
- scalable
+ 16x16 \
+ 22x22 \
+ 32x32 \
+ 48x48 \
+ scalable \
+ $(NULL)
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
diff --git a/libnautilus-actions/Makefile.am b/libnautilus-actions/Makefile.am
index ec5aa8b..4178a8d 100644
--- a/libnautilus-actions/Makefile.am
+++ b/libnautilus-actions/Makefile.am
@@ -29,7 +29,8 @@ noinst_LTLIBRARIES = libnautilus-actions.la
AM_CPPFLAGS += \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- $(NAUTILUS_ACTIONS_CFLAGS)
+ $(NAUTILUS_ACTIONS_CFLAGS) \
+ $(NULL)
libnautilus_actions_la_SOURCES = \
nautilus-actions-config.c \
@@ -44,6 +45,7 @@ libnautilus_actions_la_SOURCES = \
nautilus-actions-config-schema-writer.c \
nautilus-actions-config-schema-writer.h \
nautilus-actions-config-schema-reader.c \
- nautilus-actions-config-schema-reader.h
+ nautilus-actions-config-schema-reader.h \
+ $(NULL)
libnautilus_actions_la_LIBADD = -lxml2 -luuid
diff --git a/nact/Makefile.am b/nact/Makefile.am
index c6d559b..5ebc9ec 100644
--- a/nact/Makefile.am
+++ b/nact/Makefile.am
@@ -32,7 +32,8 @@ AM_CPPFLAGS += \
-I $(top_srcdir) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGLADEDIR=\""$(datadir)/nautilus-actions/nact"\" \
- $(NAUTILUS_ACTIONS_CFLAGS)
+ $(NAUTILUS_ACTIONS_CFLAGS) \
+ $(NULL)
nautilus_actions_config_SOURCES = \
nact.c \
@@ -46,11 +47,13 @@ nautilus_actions_config_SOURCES = \
nact-profile-editor.c \
nact-profile-editor.h \
nact-editor.c \
- nact-editor.h
+ nact-editor.h \
+ $(NULL)
nautilus_actions_config_LDADD = \
$(top_builddir)/libnautilus-actions/libnautilus-actions.la \
- $(NAUTILUS_ACTIONS_LIBS)
+ $(NAUTILUS_ACTIONS_LIBS) \
+ $(NULL)
gladedir = $(datadir)/nautilus-actions/nact
@@ -73,4 +76,5 @@ DISTCLEANFILES = \
EXTRA_DIST = \
$(Applications_in_files) \
- $(glade_DATA)
+ $(glade_DATA) \
+ $(NULL)
diff --git a/plugin/Makefile.am b/plugin/Makefile.am
index 48eca35..2321d38 100644
--- a/plugin/Makefile.am
+++ b/plugin/Makefile.am
@@ -28,7 +28,8 @@
AM_CPPFLAGS += \
-I $(top_srcdir) \
-DG_LOG_DOMAIN=\"NACT-Plugin\" \
- $(NAUTILUS_ACTIONS_CFLAGS)
+ $(NAUTILUS_ACTIONS_CFLAGS) \
+ $(NULL)
nautilus_extensiondir = $(NAUTILUS_EXTENSIONS_DIR)
@@ -41,10 +42,12 @@ libnautilus_actions_la_SOURCES = \
nautilus-actions-test.c \
nautilus-actions-test.h \
nautilus-actions-utils.c \
- nautilus-actions-utils.h
+ nautilus-actions-utils.h \
+ $(NULL)
libnautilus_actions_la_LDFLAGS = -module -avoid-version
libnautilus_actions_la_LIBADD = \
$(top_builddir)/libnautilus-actions/libnautilus-actions.la \
- $(NAUTILUS_ACTIONS_LIBS)
+ $(NAUTILUS_ACTIONS_LIBS) \
+ $(NULL)
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 2be9bb9..cb4654d 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -27,25 +27,30 @@
bin_PROGRAMS = \
nautilus-actions-new-config \
- nautilus-actions-check-actions-change
+ nautilus-actions-check-actions-change \
+ $(NULL)
AM_CPPFLAGS += \
-I $(top_srcdir) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- $(NAUTILUS_ACTIONS_UTILS_CFLAGS)
+ $(NAUTILUS_ACTIONS_UTILS_CFLAGS) \
+ $(NULL)
nautilus_actions_new_config_SOURCES = \
nautilus-actions-tools-utils.c \
nautilus-actions-tools-utils.h \
- nautilus-actions-new-config.c
+ nautilus-actions-new-config.c \
+ $(NULL)
nautilus_actions_new_config_LDADD = \
$(top_builddir)/libnautilus-actions/libnautilus-actions.la \
- $(NAUTILUS_ACTIONS_UTILS_LIBS)
+ $(NAUTILUS_ACTIONS_UTILS_LIBS) \
+ $(NULL)
nautilus_actions_check_actions_change_SOURCES = \
nautilus-actions-check-actions-change.c
nautilus_actions_check_actions_change_LDADD = \
$(top_builddir)/libnautilus-actions/libnautilus-actions.la \
- $(NAUTILUS_ACTIONS_LIBS)
+ $(NAUTILUS_ACTIONS_LIBS) \
+ $(NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]