Commit 7e1e5b3c authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

always build tools before schemas build the registry converter fall back

2007-09-09  Jody Goldberg <jody@gnome.org>

	* Makefile.am : always build tools before schemas
	* tools/Makefile.am : build the registry converter
	* schemas/Makefile.am : fall back on wine to do the gconf -> registry
	  conversion when cross compiling.

svn path=/trunk/; revision=15878
parent d2306517
2007-09-09 Jody Goldberg <jody@gnome.org>
* Makefile.am : always build tools before schemas
* tools/Makefile.am : build the registry converter
* schemas/Makefile.am : fall back on wine to do the gconf -> registry
conversion when cross compiling.
2007-09-08 J.H.M. Dassen (Ray) <jdassen@debian.org>
* configure.in: Added support for rendering documentation as PDF
......
SUBDIRS = . po po-functions src plugins icons templates doc schemas test
if WITH_WIN32
SUBDIRS += tools
endif
SUBDIRS = . po po-functions src plugins icons templates doc tools schemas test
XML_I18N_XML_KIND = --pass-through
......
......@@ -22,15 +22,13 @@ install-data-local:
endif
if WITH_WIN32
if !CROSS_COMPILING
SUFFIXES = .schemas.in .reg .hkcu.reg
regdir = $(prefix)/etc/win32/reg
reg_DATA = $(schema_in_files:.schemas.in=.reg) $(schema_in_files:.schemas.in=.hkcu.reg)
CLEANFILES += $(reg_DATA)
.schemas.in.reg:
$(top_builddir)/tools/gconf-schemas-to-win32-reg.exe $< >$@
cd $(bindir) ; $(abs_top_builddir)/tools/gconf-schemas-to-win32-reg.exe $(abs_builddir)/$< >$(abs_builddir)/$@
.schemas.in.hkcu.reg:
$(top_builddir)/tools/gconf-schemas-to-win32-reg.exe -c $< >$@
endif
cd $(bindir) ; $(abs_top_builddir)/tools/gconf-schemas-to-win32-reg.exe -c $(abs_builddir)/$< >$(abs_builddir)/$@
endif
......@@ -4,8 +4,9 @@
AM_CPPFLAGS = $(GNUMERIC_CFLAGS) -DGNUMERIC_INTERNAL
noinst_PROGRAMS =
if WITH_WIN32
noinst_PROGRAMS = gconf-schemas-to-win32-reg
noinst_PROGRAMS += gconf-schemas-to-win32-reg
gconf_schemas_to_win32_reg_SOURCES = gconf-schemas-to-win32-reg.c
gconf_schemas_to_win32_reg_LDADD = $(GNUMERIC_LIBS)
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment