GNOME.org
 

[nautilus-actions: 2/30] Make libna-runtime a dynamically loaded library

commit 0f8f5d5b278505a9e8536e9aab5e82e88faf10f6
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Nov 17 22:53:56 2009 +0100

    Make libna-runtime a dynamically loaded library

 ChangeLog                            |   16 ++++
 configure.ac                         |    1 +
 nautilus-actions/Makefile.am         |    1 +
 nautilus-actions/common/Makefile.am  |    2 +-
 nautilus-actions/nact/Makefile.am    |  156 +++++++++++++++++-----------------
 nautilus-actions/plugin/Makefile.am  |   16 ++--
 nautilus-actions/runtime/Makefile.am |    9 ++-
 nautilus-actions/test/Makefile.am    |   47 +++++-----
 nautilus-actions/utils/Makefile.am   |   36 ++++----
 po/POTFILES.in                       |   64 +++++++-------
 10 files changed, 186 insertions(+), 162 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7e352cd..ed1d125 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2009-11-17 Pierre Wieser <pwieser trychlos org>
 
+	Make libna-runtime a dynamically loaded library.
+	Initialize the API directory.
+
+	* nautilus-actions/api: New directory.
+
+	* nautilus-actions/common/Makefile.am:
+	* nautilus-actions/nact/Makefile.am:
+	* nautilus-actions/plugin/Makefile.am:
+	* nautilus-actions/runtime/Makefile.am:
+	* nautilus-actions/test/Makefile.am:
+	* nautilus-actions/utils/Makefile.am: Updated accordingly.
+
+	* po/POTFILES.in: Updated to reflect src/ directory renaming.
+
+2009-11-17 Pierre Wieser <pwieser trychlos org>
+
 	Rename all src/ tree to nautilus-actions/.
 
 	This will make easier to have an API installed on a host system,
diff --git a/configure.ac b/configure.ac
index 82b2eeb..3782c28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,6 +48,7 @@ AC_CONFIG_FILES([
 	icons/48x48/Makefile
 	icons/scalable/Makefile
 	nautilus-actions/Makefile
+	nautilus-actions/api/Makefile
 	nautilus-actions/common/Makefile
 	nautilus-actions/nact/Makefile
 	nautilus-actions/plugin/Makefile
diff --git a/nautilus-actions/Makefile.am b/nautilus-actions/Makefile.am
index e027299..30454ec 100644
--- a/nautilus-actions/Makefile.am
+++ b/nautilus-actions/Makefile.am
@@ -29,6 +29,7 @@
 SUBDIRS = \
 	common						\
 	runtime						\
+	api							\
 	nact						\
 	plugin						\
 	test						\
diff --git a/nautilus-actions/common/Makefile.am b/nautilus-actions/common/Makefile.am
index 7d61572..bcabf6a 100644
--- a/nautilus-actions/common/Makefile.am
+++ b/nautilus-actions/common/Makefile.am
@@ -29,7 +29,7 @@
 noinst_LTLIBRARIES = libna-common.la
 
 AM_CPPFLAGS += \
-	-I $(top_srcdir)/src						\
+	-I $(top_srcdir)/nautilus-actions			\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_COMMON}\"	\
 	$(NAUTILUS_ACTIONS_CFLAGS)					\
diff --git a/nautilus-actions/nact/Makefile.am b/nautilus-actions/nact/Makefile.am
index 05ef449..a5b037f 100644
--- a/nautilus-actions/nact/Makefile.am
+++ b/nautilus-actions/nact/Makefile.am
@@ -27,81 +27,81 @@
 #   ... and many others (see AUTHORS)
 
 bin_PROGRAMS = \
-	nautilus-actions-config-tool						\
+	nautilus-actions-config-tool								\
 	$(NULL)
 
 AM_CPPFLAGS += \
-	-I $(top_srcdir)/src								\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"			\
-	-DPKGDATADIR=\"$(pkgdatadir)\"						\
-	-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_NACT}\"				\
-	$(NAUTILUS_ACTIONS_CFLAGS)							\
+	-I $(top_srcdir)/nautilus-actions							\
+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"					\
+	-DPKGDATADIR=\"$(pkgdatadir)\"								\
+	-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_NACT}\"						\
+	$(NAUTILUS_ACTIONS_CFLAGS)									\
 	$(NULL)
 
 BUILT_SOURCES = \
-	nact-marshal.c										\
-	nact-marshal.h										\
+	nact-marshal.c												\
+	nact-marshal.h												\
 	$(NULL)
 
 nautilus_actions_config_tool_SOURCES = \
-	base-application.c									\
-	base-application.h									\
-	base-application-class.h							\
-	base-assistant.c									\
-	base-assistant.h									\
-	base-builder.c										\
-	base-builder.h										\
-	base-dialog.c										\
-	base-dialog.h										\
-	base-iprefs.c										\
-	base-iprefs.h										\
-	base-window.c										\
-	base-window.h										\
-	base-window-class.h									\
-	egg-tree-multi-dnd.c								\
-	egg-tree-multi-dnd.h								\
-	nact-application.c									\
-	nact-application.h									\
-	nact-assistant-export.c								\
-	nact-assistant-export.h								\
-	nact-assistant-export-ask.c							\
-	nact-assistant-export-ask.h							\
-	nact-assistant-import.c								\
-	nact-assistant-import.h								\
-	nact-assistant-import-ask.c							\
-	nact-assistant-import-ask.h							\
-	nact-clipboard.c									\
-	nact-clipboard.h									\
-	nact-iactions-list.c								\
-	nact-iactions-list.h								\
-	nact-iaction-tab.c									\
-	nact-iaction-tab.h									\
-	nact-iadvanced-tab.c								\
-	nact-iadvanced-tab.h								\
-	nact-ibackground-tab.c								\
-	nact-ibackground-tab.h								\
-	nact-icommand-tab.c									\
-	nact-icommand-tab.h									\
-	nact-iconditions-tab.c								\
-	nact-iconditions-tab.h								\
-	nact-main.c											\
-	nact-main-menubar.c									\
-	nact-main-menubar.h									\
-	nact-main-statusbar.c								\
-	nact-main-statusbar.h								\
-	nact-main-tab.c										\
-	nact-main-tab.h										\
-	nact-main-window.c									\
-	nact-main-window.h									\
-	nact-preferences-editor.c							\
-	nact-preferences-editor.h							\
-	nact-tree-model.c									\
-	nact-tree-model.h									\
-	nact-window.c										\
-	nact-window.h										\
-	nact-xml-reader.c									\
-	nact-xml-reader.h									\
-	$(BUILT_SOURCES)									\
+	base-application.c											\
+	base-application.h											\
+	base-application-class.h									\
+	base-assistant.c											\
+	base-assistant.h											\
+	base-builder.c												\
+	base-builder.h												\
+	base-dialog.c												\
+	base-dialog.h												\
+	base-iprefs.c												\
+	base-iprefs.h												\
+	base-window.c												\
+	base-window.h												\
+	base-window-class.h											\
+	egg-tree-multi-dnd.c										\
+	egg-tree-multi-dnd.h										\
+	nact-application.c											\
+	nact-application.h											\
+	nact-assistant-export.c										\
+	nact-assistant-export.h										\
+	nact-assistant-export-ask.c									\
+	nact-assistant-export-ask.h									\
+	nact-assistant-import.c										\
+	nact-assistant-import.h										\
+	nact-assistant-import-ask.c									\
+	nact-assistant-import-ask.h									\
+	nact-clipboard.c											\
+	nact-clipboard.h											\
+	nact-iactions-list.c										\
+	nact-iactions-list.h										\
+	nact-iaction-tab.c											\
+	nact-iaction-tab.h											\
+	nact-iadvanced-tab.c										\
+	nact-iadvanced-tab.h										\
+	nact-ibackground-tab.c										\
+	nact-ibackground-tab.h										\
+	nact-icommand-tab.c											\
+	nact-icommand-tab.h											\
+	nact-iconditions-tab.c										\
+	nact-iconditions-tab.h										\
+	nact-main.c													\
+	nact-main-menubar.c											\
+	nact-main-menubar.h											\
+	nact-main-statusbar.c										\
+	nact-main-statusbar.h										\
+	nact-main-tab.c												\
+	nact-main-tab.h												\
+	nact-main-window.c											\
+	nact-main-window.h											\
+	nact-preferences-editor.c									\
+	nact-preferences-editor.h									\
+	nact-tree-model.c											\
+	nact-tree-model.h											\
+	nact-window.c												\
+	nact-window.h												\
+	nact-xml-reader.c											\
+	nact-xml-reader.h											\
+	$(BUILT_SOURCES)											\
 	$(NULL)
 
 nact-marshal.h: nact-marshal.list $(GLIB_GENMARSHAL)
@@ -112,16 +112,16 @@ nact-marshal.c: nact-marshal.list $(GLIB_GENMARSHAL)
 	$(GLIB_GENMARSHAL) $< --body --prefix=nact_marshal >> $@
 
 nautilus_actions_config_tool_LDADD = \
-	$(top_builddir)/src/common/libna-common.la			\
-	$(top_builddir)/src/runtime/libna-runtime.la		\
-	$(NAUTILUS_ACTIONS_LIBS)							\
+	$(top_builddir)/nautilus-actions/common/libna-common.la		\
+	-L$(top_builddir)/nautilus-actions/runtime -lna-runtime		\
+	$(NAUTILUS_ACTIONS_LIBS)									\
 	$(NULL)
 
 pkgdata_DATA = \
-	nautilus-actions-config-tool.actions				\
-	nautilus-actions-maintainer.actions					\
-	nact-assistant-export.ui							\
-	nautilus-actions-config-tool.ui						\
+	nautilus-actions-config-tool.actions						\
+	nautilus-actions-maintainer.actions							\
+	nact-assistant-export.ui									\
+	nautilus-actions-config-tool.ui								\
 	$(NULL)
 
 @INTLTOOL_DESKTOP_RULE@
@@ -135,14 +135,14 @@ applicationsdir = $(datadir)/applications
 applications_DATA = $(applications_files)
 
 CLEANFILES = \
-	$(applications_files)								\
-	$(BUILT_SOURCES)									\
+	$(applications_files)										\
+	$(BUILT_SOURCES)											\
 	$(NULL)
 
 EXTRA_DIST = \
-	$(applications_in_files)							\
-	$(pkgdata_DATA)										\
-	nact-marshal.list									\
+	$(applications_in_files)									\
+	$(pkgdata_DATA)												\
+	nact-marshal.list											\
 	$(NULL)
 
 uninstall-hook:
diff --git a/nautilus-actions/plugin/Makefile.am b/nautilus-actions/plugin/Makefile.am
index adf406d..dfa14fc 100644
--- a/nautilus-actions/plugin/Makefile.am
+++ b/nautilus-actions/plugin/Makefile.am
@@ -27,9 +27,9 @@
 #   ... and many others (see AUTHORS)
 
 AM_CPPFLAGS += \
-	-I $(top_srcdir)/src								\
-	$(NAUTILUS_ACTIONS_CFLAGS)							\
-	-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_PLUGIN}\"			\
+	-I $(top_srcdir)/nautilus-actions							\
+	-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_PLUGIN}\"					\
+	$(NAUTILUS_ACTIONS_CFLAGS)									\
 	$(NULL)
 
 nautilus_extensiondir = $(NAUTILUS_EXTENSIONS_DIR)
@@ -37,14 +37,14 @@ nautilus_extensiondir = $(NAUTILUS_EXTENSIONS_DIR)
 nautilus_extension_LTLIBRARIES = libnautilus-actions.la
 
 libnautilus_actions_la_SOURCES = \
-	nautilus-module.c									\
-	nautilus-actions.c									\
-	nautilus-actions.h									\
+	nautilus-module.c											\
+	nautilus-actions.c											\
+	nautilus-actions.h											\
 	$(NULL)
 
 libnautilus_actions_la_LDFLAGS = -module -avoid-version
 
 libnautilus_actions_la_LIBADD = \
-	$(top_builddir)/src/runtime/libna-runtime.la		\
-	$(NAUTILUS_ACTIONS_LIBS)							\
+	-L$(top_builddir)/nautilus-actions/runtime -lna-runtime		\
+	$(NAUTILUS_ACTIONS_LIBS)									\
 	$(NULL)
diff --git a/nautilus-actions/runtime/Makefile.am b/nautilus-actions/runtime/Makefile.am
index 999d377..bd1910c 100644
--- a/nautilus-actions/runtime/Makefile.am
+++ b/nautilus-actions/runtime/Makefile.am
@@ -26,7 +26,7 @@
 #   Pierre Wieser <pwieser trychlos org>
 #   ... and many others (see AUTHORS)
 
-noinst_LTLIBRARIES = libna-runtime.la
+pkglib_LTLIBRARIES = libna-runtime.la
 
 AM_CPPFLAGS += \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
@@ -88,3 +88,10 @@ libna_runtime_la_SOURCES = \
 
 libna_runtime_la_LIBADD = \
 	$(NULL)
+
+VERSION_INFO = 1:0:0
+libna_runtime_la_LDFLAGS = \
+	-module										\
+	-no-undefined								\
+	-version-number $(VERSION_INFO)				\
+	$(NULL)
diff --git a/nautilus-actions/test/Makefile.am b/nautilus-actions/test/Makefile.am
index 92c53fe..d4ec998 100644
--- a/nautilus-actions/test/Makefile.am
+++ b/nautilus-actions/test/Makefile.am
@@ -27,55 +27,54 @@
 #   ... and many others (see AUTHORS)
 
 noinst_PROGRAMS = \
-	test-iface										\
-	test-parse-uris									\
-	test-virtuals									\
-	test-virtuals-without-test						\
+	test-iface													\
+	test-parse-uris												\
+	test-virtuals												\
+	test-virtuals-without-test									\
 	$(NULL)
 
 AM_CPPFLAGS += \
-	-I $(top_srcdir)/src							\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		\
-	$(NAUTILUS_ACTIONS_CFLAGS)						\
-	-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_TEST}\"			\
+	-I $(top_srcdir)/nautilus-actions							\
+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"					\
+	-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_TEST}\"						\
+	$(NAUTILUS_ACTIONS_CFLAGS)									\
 	$(NULL)
 
 test_iface_SOURCES = \
-	test-iface.c									\
-	test-iface-iface.c								\
-	test-iface-iface.h								\
-	test-iface-base.c								\
-	test-iface-base.h								\
-	test-iface-derived.c							\
-	test-iface-derived.h							\
+	test-iface.c												\
+	test-iface-iface.c											\
+	test-iface-iface.h											\
+	test-iface-base.c											\
+	test-iface-base.h											\
+	test-iface-derived.c										\
+	test-iface-derived.h										\
 	$(NULL)
 
 test_iface_LDADD = \
-	$(NAUTILUS_ACTIONS_LIBS)						\
+	$(NAUTILUS_ACTIONS_LIBS)									\
 	$(NULL)
 
 test_parse_uris_SOURCES = \
-	test-parse-uris.c								\
+	test-parse-uris.c											\
 	$(NULL)
 
 test_parse_uris_LDADD = \
-	$(top_builddir)/src/runtime/libna-runtime.la	\
-	$(NAUTILUS_ACTIONS_LIBS)						\
+	-L$(top_builddir)/nautilus-actions/runtime -lna-runtime		\
+	$(NAUTILUS_ACTIONS_LIBS)									\
 	$(NULL)
 
 test_virtuals_SOURCES = \
-	test-virtuals.c									\
+	test-virtuals.c												\
 	$(NULL)
 
 test_virtuals_LDADD = \
-	$(NAUTILUS_ACTIONS_LIBS)						\
+	$(NAUTILUS_ACTIONS_LIBS)									\
 	$(NULL)
 
 test_virtuals_without_test_SOURCES = \
-	test-virtuals-without-test.c					\
+	test-virtuals-without-test.c								\
 	$(NULL)
 
 test_virtuals_Lwithout_test_DADD = \
-	$(NAUTILUS_ACTIONS_LIBS)						\
+	$(NAUTILUS_ACTIONS_LIBS)									\
 	$(NULL)
-	
\ No newline at end of file
diff --git a/nautilus-actions/utils/Makefile.am b/nautilus-actions/utils/Makefile.am
index 572ba60..26a6620 100644
--- a/nautilus-actions/utils/Makefile.am
+++ b/nautilus-actions/utils/Makefile.am
@@ -27,37 +27,37 @@
 #   ... and many others (see AUTHORS)
 
 bin_PROGRAMS = \
-	nautilus-actions-new							\
-	nautilus-actions-schemas						\
+	nautilus-actions-new										\
+	nautilus-actions-schemas									\
 	$(NULL)
 
 AM_CPPFLAGS += \
-	-I $(top_srcdir)/src							\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		\
-	$(NAUTILUS_ACTIONS_CFLAGS)						\
-	-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_UTILS}\"		\
+	-I $(top_srcdir)/nautilus-actions							\
+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"					\
+	-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_UTILS}\"					\
+	$(NAUTILUS_ACTIONS_CFLAGS)									\
 	$(NULL)
 
 nautilus_actions_new_SOURCES = \
-	nautilus-actions-new.c							\
-	console-utils.c									\
-	console-utils.h									\
+	nautilus-actions-new.c										\
+	console-utils.c												\
+	console-utils.h												\
 	$(NULL)
 
 nautilus_actions_new_LDADD = \
-	$(top_builddir)/src/common/libna-common.la		\
-	$(top_builddir)/src/runtime/libna-runtime.la	\
-	$(NAUTILUS_ACTIONS_LIBS)						\
+	$(top_builddir)/nautilus-actions/common/libna-common.la		\
+	-L$(top_builddir)/nautilus-actions/runtime -lna-runtime		\
+	$(NAUTILUS_ACTIONS_LIBS)									\
 	$(NULL)
 
 nautilus_actions_schemas_SOURCES = \
-	nautilus-actions-schemas.c						\
-	console-utils.c									\
-	console-utils.h									\
+	nautilus-actions-schemas.c									\
+	console-utils.c												\
+	console-utils.h												\
 	$(NULL)
 
 nautilus_actions_schemas_LDADD = \
-	$(top_builddir)/src/common/libna-common.la		\
-	$(top_builddir)/src/runtime/libna-runtime.la	\
-	$(NAUTILUS_ACTIONS_LIBS)						\
+	$(top_builddir)/nautilus-actions/common/libna-common.la		\
+	-L$(top_builddir)/nautilus-actions/runtime -lna-runtime		\
+	$(NAUTILUS_ACTIONS_LIBS)									\
 	$(NULL)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3428fd6..4721cbc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,33 +1,33 @@
 data/nautilus-actions.schemas.in
-src/common/na-object-action.c
-src/common/na-object-id.c
-src/common/na-xml-names.h
-src/nact/base-application.c
-src/nact/base-assistant.c
-src/nact/base-window.c
-src/nact/nact-application.c
-src/nact/nact-assistant-export.c
-src/nact/nact-assistant-export.ui
-src/nact/nact-assistant-export-ask.c
-src/nact/nact-assistant-import.c
-src/nact/nact-assistant-import-ask.c
-src/nact/nact.desktop.in
-src/nact/nact-iactions-list.c
-src/nact/nact-iaction-tab.c
-src/nact/nact-iadvanced-tab.c
-src/nact/nact-ibackground-tab.c
-src/nact/nact-icommand-tab.c
-src/nact/nact-main-menubar.c
-src/nact/nact-main-window.c
-src/nact/nact-tree-model.c
-src/nact/nact-window.c
-src/nact/nact-xml-reader.c
-src/nact/nautilus-actions-config-tool.ui
-src/plugin/nautilus-actions.c
-src/runtime/na-iabout.c
-src/runtime/na-object-action-fn.h
-src/runtime/na-object-menu-fn.h
-src/runtime/na-object-profile-fn.h
-src/test/test-parse-uris.c
-src/utils/nautilus-actions-new.c
-src/utils/nautilus-actions-schemas.c
+nautilus-actions/common/na-object-action.c
+nautilus-actions/common/na-object-id.c
+nautilus-actions/common/na-xml-names.h
+nautilus-actions/nact/base-application.c
+nautilus-actions/nact/base-assistant.c
+nautilus-actions/nact/base-window.c
+nautilus-actions/nact/nact-application.c
+nautilus-actions/nact/nact-assistant-export.c
+nautilus-actions/nact/nact-assistant-export.ui
+nautilus-actions/nact/nact-assistant-export-ask.c
+nautilus-actions/nact/nact-assistant-import.c
+nautilus-actions/nact/nact-assistant-import-ask.c
+nautilus-actions/nact/nact.desktop.in
+nautilus-actions/nact/nact-iactions-list.c
+nautilus-actions/nact/nact-iaction-tab.c
+nautilus-actions/nact/nact-iadvanced-tab.c
+nautilus-actions/nact/nact-ibackground-tab.c
+nautilus-actions/nact/nact-icommand-tab.c
+nautilus-actions/nact/nact-main-menubar.c
+nautilus-actions/nact/nact-main-window.c
+nautilus-actions/nact/nact-tree-model.c
+nautilus-actions/nact/nact-window.c
+nautilus-actions/nact/nact-xml-reader.c
+nautilus-actions/nact/nautilus-actions-config-tool.ui
+nautilus-actions/plugin/nautilus-actions.c
+nautilus-actions/runtime/na-iabout.c
+nautilus-actions/runtime/na-object-action-fn.h
+nautilus-actions/runtime/na-object-menu-fn.h
+nautilus-actions/runtime/na-object-profile-fn.h
+nautilus-actions/test/test-parse-uris.c
+nautilus-actions/utils/nautilus-actions-new.c
+nautilus-actions/utils/nautilus-actions-schemas.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]