[nautilus-actions: 6/30] Create private/ subdirectory

[Pierre Wieser <pwieser src gnome org>]

commit e4c7590f863f8e434c752afe527389036f2402be
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Nov 18 20:40:38 2009 +0100

    Create private/ subdirectory
    
    This directory will host installed, though private, required headers.

 ChangeLog                            |   13 ++++++++
 configure.ac                         |    1 +
 m4/na-log-domains.m4                 |    6 ++++
 nautilus-actions/Makefile.am         |    3 +-
 nautilus-actions/private/Makefile.am |   55 ++++++++++++++++++++++++++++++++++
 nautilus-actions/private/README      |   10 ++++++
 6 files changed, 87 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8b6a72d..f020ae9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-11-18 Pierre Wieser <pwieser trychlos org>
+
+	Create private/ directory to host installed though private headers.
+
+	* configure.ac:
+	* nautilus-actions/Makefile.am: Updated accordingly.
+
+	* m4/na-log-domains.m4:
+	Define new log domains for API and private libraries.
+
+	* nautilus-actions/private/Makefile.am:
+	* nautilus-actions/private/README: New files.
+
 2009-11-17 Pierre Wieser <pwieser trychlos org>
 
 	Move NAIIOProvider interface to api/.
diff --git a/configure.ac b/configure.ac
index 3782c28..3ebd0e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,7 @@ AC_CONFIG_FILES([
 	nautilus-actions/common/Makefile
 	nautilus-actions/nact/Makefile
 	nautilus-actions/plugin/Makefile
+	nautilus-actions/private/Makefile
 	nautilus-actions/runtime/Makefile
 	nautilus-actions/test/Makefile
 	nautilus-actions/utils/Makefile
diff --git a/m4/na-log-domains.m4 b/m4/na-log-domains.m4
index b811e99..24f9265 100644
--- a/m4/na-log-domains.m4
+++ b/m4/na-log-domains.m4
@@ -5,6 +5,12 @@ dnl when not in development mode
 # serial 2 define NA-runtime log domain
 
 AC_DEFUN([NA_LOG_DOMAINS],[
+	AC_SUBST([NA_LOGDOMAIN_API],[NA-api])
+	AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_API],["NA-api"],[Log domain of API library])
+
+	AC_SUBST([NA_LOGDOMAIN_PRIVATE],[NA-private])
+	AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_PRIVATE],["NA-private"],[Log domain of private library])
+
 	AC_SUBST([NA_LOGDOMAIN_RUNTIME],[NA-runtime])
 	AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_RUNTIME],["NA-runtime"],[Log domain of runtime library])
 
diff --git a/nautilus-actions/Makefile.am b/nautilus-actions/Makefile.am
index 30454ec..a68ec41 100644
--- a/nautilus-actions/Makefile.am
+++ b/nautilus-actions/Makefile.am
@@ -27,9 +27,10 @@
 #   ... and many others (see AUTHORS)
 
 SUBDIRS = \
+	api							\
+	private						\
 	common						\
 	runtime						\
-	api							\
 	nact						\
 	plugin						\
 	test						\
diff --git a/nautilus-actions/private/Makefile.am b/nautilus-actions/private/Makefile.am
new file mode 100644
index 0000000..919c070
--- /dev/null
+++ b/nautilus-actions/private/Makefile.am
@@ -0,0 +1,55 @@
+# Nautilus Actions
+# A Nautilus extension which offers configurable context menu actions.
+#
+# Copyright (C) 2005 The GNOME Foundation
+# Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+# Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
+#
+# This Program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This Program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this Library; see the file COPYING.  If not,
+# write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307, USA.
+#
+# Authors:
+#   Frederic Ruaudel <grumz grumz net>
+#   Rodrigo Moya <rodrigo gnome-db org>
+#   Pierre Wieser <pwieser trychlos org>
+#   ... and many others (see AUTHORS)
+
+pkglib_LTLIBRARIES = libna-private.la
+
+AM_CPPFLAGS += \
+	-I $(top_srcdir)							\
+	-DPKGLIBDIR=\""$(pkglibdir)"\"				\
+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+	-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_PRIVATE}\"	\
+	$(NAUTILUS_ACTIONS_CFLAGS)					\
+	$(NULL)
+
+libna_private_includedir = $(pkgincludedir)/private
+
+libna_private_include_HEADERS = \
+	$(NULL)
+
+libna_private_la_SOURCES = \
+	$(NULL)
+
+libna_private_la_LIBADD = \
+	$(NULL)
+
+VERSION_INFO = 1:0:0
+libna_private_la_LDFLAGS = \
+	-module										\
+	-no-undefined								\
+	-version-number $(VERSION_INFO)				\
+	$(NULL)
diff --git a/nautilus-actions/private/README b/nautilus-actions/private/README
new file mode 100644
index 0000000..00e03c9
--- /dev/null
+++ b/nautilus-actions/private/README
@@ -0,0 +1,10 @@
+This is a Nautilus Actions private library.
+
+This is so called just because headers are or may be required by public
+Nautilus-Action API or by extensions who use this API.
+
+It so appears a bit more cleaner to put the corresponding code just
+besides of these headers, and to build with them a dynamic library.
+
+It is called private because headers are installed as part of N-A
+development, but should not be directly included by external extensions.