hal ChangeLog, 1.317, 1.318 Makefile.am, 1.7, 1.8 autogen.sh, 1.1, 1.2 configure.in, 1.41, 1.42 hal-storage.pc.in, NONE, 1.1

David Zeuthen david at freedesktop.org
Thu Sep 23 11:13:47 PDT 2004


Update of /cvs/hal/hal
In directory gabe:/tmp/cvs-serv17124

Modified Files:
	ChangeLog Makefile.am autogen.sh configure.in 
Added Files:
	hal-storage.pc.in 
Log Message:
2004-09-23  David Zeuthen  <david at fubar.dk>

	* po/POTFILES.in: New file

	* libhal-storage/libhal-storage.h: New file

	* libhal-storage/libhal-storage.c: New file

	* libhal/libhal.c: Add dgettext support
	(hal_initialize): Bind to translation domain (but only once)

	* doc/api/Makefile.am (htmldocdir): Rename to api from libhal

	* Doxyfile.in: Add libhal-storage

	* configure.in: Add checks for i18n tools. Add hal-storage.pc,
	libhal-storage/Makefile and po/Makefile.in to AC_OUTPUT

	* autogen.sh: Add checks for i18n tools

	* hal-storage.pc.in: New file

	* Makefile.am: Add libhal-storage and po to SUBDIRS. Add hal-storage.pc



Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -d -r1.317 -r1.318
--- ChangeLog	23 Sep 2004 11:06:13 -0000	1.317
+++ ChangeLog	23 Sep 2004 18:13:45 -0000	1.318
@@ -1,3 +1,27 @@
+2004-09-23  David Zeuthen  <david at fubar.dk>
+
+	* po/POTFILES.in: New file
+
+	* libhal-storage/libhal-storage.h: New file
+
+	* libhal-storage/libhal-storage.c: New file
+
+	* libhal/libhal.c: Add dgettext support
+	(hal_initialize): Bind to translation domain (but only once)
+
+	* doc/api/Makefile.am (htmldocdir): Rename to api from libhal
+
+	* Doxyfile.in: Add libhal-storage
+
+	* configure.in: Add checks for i18n tools. Add hal-storage.pc,
+	libhal-storage/Makefile and po/Makefile.in to AC_OUTPUT
+
+	* autogen.sh: Add checks for i18n tools
+
+	* hal-storage.pc.in: New file
+
+	* Makefile.am: Add libhal-storage and po to SUBDIRS. Add hal-storage.pc
+
 2004-09-23  Kay Sievers  <kay.sievers at vrfy.org>
 
 	* hald/linux/block_class_device.c: (block_class_pre_process): fix

Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.am	23 Jul 2004 20:44:28 -0000	1.7
+++ Makefile.am	23 Sep 2004 18:13:45 -0000	1.8
@@ -1,17 +1,17 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = libhal hald tools fdi doc examples
+SUBDIRS = libhal libhal-storage hald tools fdi doc examples po
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = hal.pc
+pkgconfig_DATA = hal.pc hal-storage.pc
 
 dbusdir = $(DBUS_SYS_DIR)
 dist_dbus_DATA = hal.conf
 
 
-DISTCLEANFILES = hal.pc
+DISTCLEANFILES = hal.pc hal-storage.pc
 
-EXTRA_DIST = HACKING hal.pc.in hal.conf.in
+EXTRA_DIST = HACKING hal.pc.in hal-storage.pc.in hal.conf.in
 
 clean-local :
 	rm -f *~

Index: autogen.sh
===================================================================
RCS file: /cvs/hal/hal/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- autogen.sh	5 Nov 2003 23:22:50 -0000	1.1
+++ autogen.sh	23 Sep 2004 18:13:45 -0000	1.2
@@ -94,6 +94,9 @@
   fi
 done
 
+glib-gettextize --force --copy                              || exit 1
+intltoolize --copy --force --automake                  || exit 1
+
 conf_flags="--enable-maintainer-mode"
 
 if test x$NOCONFIGURE = x; then

Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- configure.in	20 Sep 2004 09:07:54 -0000	1.41
+++ configure.in	23 Sep 2004 18:13:45 -0000	1.42
@@ -372,14 +372,25 @@
 fi
 
 
+ALL_LINGUAS="da"
+AC_SUBST(ALL_LINGUAS)
+
+GETTEXT_PACKAGE=AC_PACKAGE_NAME
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the gettext package])
+
+AC_PROG_INTLTOOL([0.22])
+AM_GLIB_GNU_GETTEXT
 
 AC_OUTPUT([
 hal.pc
+hal-storage.pc
 hal.conf
 Makefile
 hald/Makefile
 hald/haldaemon
 libhal/Makefile
+libhal-storage/Makefile
 tools/Makefile
 tools/linux/Makefile
 tools/device-manager/Makefile
@@ -394,8 +405,9 @@
 doc/spec/hal-spec.xml
 examples/Makefile
 examples/volumed/Makefile
+po/Makefile.in
 ])
-
+	
 dnl ==========================================================================
 echo "
                     HAL $VERSION

--- NEW FILE: hal-storage.pc.in ---
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

Name: hal-storage
Description: hal library for storage devices and volumes
Version: @VERSION@
Requires: dbus-1 hal
Libs: -L${libdir} -lhal-storage
Cflags: -DDBUS_API_SUBJECT_TO_CHANGE -I${includedir}/hal




More information about the hal-commit mailing list