Commit 38364d80 authored by Stepan Kasal's avatar Stepan Kasal

fix the declaration of generated sources and the po-functions/POTFILES problem

parent d5ed804c
2005-02-22 Stepan Kasal <kasal@ucw.cz>
* configure.in: Fix creation of po-functions/POTFILES.
* src/Makefile.am: Fix declarations for generated sources.
* src/cut-n-paste-code/goffice/utils/Makefile.am: Likewise.
* plugins/corba/Makefile.am: Likewise.
* idl/Makefile.am: Likewise.
2005-02-18 Morten Welinder <terra@gnome.org>
* src/stf-parse.c (count_character): Ignore completely empty
......
2005-02-22 Stepan Kasal <kasal@ucw.cz>
* configure.in: Fix creation of po-functions/POTFILES.
* src/Makefile.am: Fix declarations for generated sources.
* src/cut-n-paste-code/goffice/utils/Makefile.am: Likewise.
* plugins/corba/Makefile.am: Likewise.
* idl/Makefile.am: Likewise.
2005-02-18 Morten Welinder <terra@gnome.org>
* src/stf-parse.c (count_character): Ignore completely empty
......
......@@ -524,20 +524,44 @@ AC_SUBST(STRIP_BEGIN)
AC_SUBST(STRIP_END)
# i18n stuff
# TRANSLATORS: Please note that gtk+ has both po/ and po-functions/
# directories. If you add a new language to ALL_LINGUAS, please make
# sure that both po/ and po-functions/ have .po files that correspond
# to your language. If you only add one to po/, the build will break
# in po-functions/.
ALL_LINGUAS="am az bg ca cs da de el en_CA en_GB es et fi fr ga gl he hr hu it ja ko lv ml mr ms nb nl nn no pl pt pt_BR ro ru sk sr sr@Latn sv tr uk vi zh_CN zh_TW"
AC_SUBST(ALL_LINGUAS)
GETTEXT_PACKAGE=gnumeric
AC_SUBST(GETTEXT_PACKAGE)
ifelse([
TRANSLATORS:
Please note that gtk+ has both po/ and po-functions/ directories.
If you add a new language to ALL_LINGUAS, please make sure that both
po/ and po-functions/ have .po files that correspond to your language.
If you only add one to po/, the build will break in po-functions/.
])
AC_SUBST(ALL_LINGUAS,
"am az bg ca cs da de el en_CA en_GB es et fi fr ga gl he hr hu it ja ko lv ml mr ms nb nl nn no pl pt pt_BR ro ru sk sr sr@Latn sv tr uk vi zh_CN zh_TW")
AC_SUBST(GETTEXT_PACKAGE, gnumeric)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
[The package name, for gettext]
)
AM_GLIB_GNU_GETTEXT
# Create po-functions/POTFILES.
dnl
dnl Note that po/POTFILES is also created by configure, not by config.status.
dnl In fact, it is created in two iterations: first step was done just above
dnl by AM_GLIB_GNU_GETTEXT, while the second step, which comes from
dnl intltool.m4, is executed just before the creation of config.status.
dnl (But po-functions/POTFILES is created in one step, here.)
[
test -d po-functions || mkdir po-functions
rm -f po-functions/POTFILES
case "$srcdir" in
.) top_srcdir=.. ;;
[\\/]* | ?:[\\/]* ) # Absolute name.
top_srcdir="$srcdir" ;;
*) top_srcdir="../$srcdir" ;;
esac
sed <"$srcdir/po-functions/POTFILES.in" -e '/^#/d' -e 's/^[[].*[]] *//' \
-e '/^[ ]*$/d' -e "s,^, $top_srcdir/," | \
sed -e '$!s/$/ \\/' >po-functions/POTFILES
]
AC_OUTPUT_COMMANDS([case "$CONFIG_FILES" in *po-functions/Makefile.in*)
sed -e "/POTFILES =/r po-functions/POTFILES" po-functions/Makefile.in > po-functions/Makefile
esac])
......
......@@ -52,12 +52,12 @@ CLEANFILES = $(nodist_libGnumericIDL_a_SOURCES) \
stamp_Gnumeric_idl stamp_evolution_idl
1.
Frantiek Listopad
Frantisek Listopad
Bh belh klopt
z komory do kuchyn
va bramboraku
oplchne starou lci
Buh belha klopyta
z komory do kuchyne
vari bramboracku
oplachne starou lzici
sedne si u okna
dv si udiven
diva si udivene
To jsem to dopracoval
......@@ -7,23 +7,26 @@ gnumeric_plugin_corbadir = $(gnumeric_plugindir)/corba
xmldir = $(gnumeric_plugin_corbadir)
gnumeric_plugin_corba_LTLIBRARIES = corba.la
corba_la_LDFLAGS = -module $(GNUMERIC_PLUGIN_LDFLAGS)
corba_la_SOURCES = $(GNUMERIC_GENERATED) \
corba_la_SOURCES = \
corba-application.c \
corba-workbook.c \
corba-workbook.h \
corba-sheet.c \
corba-sheet.h
GNUMERIC_GENERATED = \
nodist_corba_la_SOURCES = \
GNOME_Gnumeric-common.c \
GNOME_Gnumeric-skels.c \
GNOME_Gnumeric-stubs.c \
GNOME_Gnumeric.h
stamp_Gnumeric_idl : $(srcdir)/GNOME_Gnumeric.idl
# A hint is needed to build the header first:
BUILT_SOURCES = GNOME_Gnumeric.h
stamp_Gnumeric_idl: $(srcdir)/GNOME_Gnumeric.idl
$(ORBIT_IDL) -I$(srcdir) $< && touch $@
$(GNUMERIC_GENERATED): stamp_Gnumeric_idl
$(nodist_corba_la_SOURCES): stamp_Gnumeric_idl
idldir = $(gnumeric_datadir)/idl
idl_DATA = GNOME_Gnumeric.idl
......@@ -33,11 +36,5 @@ xml_DATA = $(xml_in_files:.xml.in=.xml)
@INTLTOOL_XML_RULE@
# Do not use built sources BUILT_SOURCES
# it attempts to build the source even if it is not used.
DISTCLEANFILES = $(GNUMERIC_GENERATED) stamp_Gnumeric_idl $(xml_DATA)
CLEANFILES = $(nodist_corba_la_SOURCES) stamp_Gnumeric_idl $(xml_DATA)
EXTRA_DIST = $(idl_DATA) $(xml_in_files)
dist-hook :
cd $(distdir) && rm -f $(DISTCLEANFILES)
#
# Gnumeric's Makefile.
# Gnumeric's Makefile.am
# Author: Miguel de Icaza (miguel@kernel.org)
SUBDIRS = tools cut-n-paste-code
......@@ -32,15 +32,17 @@ INCLUDES = \
-I$(top_srcdir)/src/cut-n-paste-code/foocanvas \
$(GNUMERIC_CFLAGS)
CLEANFILES = gnumeric-paths.h gnumeric.exe.a
# A hint is needed to build these headers first:
BUILT_SOURCES = \
gnm-marshalers.h \
gnm-marshalers.c \
gnumeric-paths.h
CLEANFILES = $(BUILT_SOURCES) \
gnm-marshalers.c \
gnumeric.exe.a
GNUMERIC_BASE = \
$(BUILT_SOURCES) \
gnm-marshalers.list \
application.c \
application.h \
auto-format.c \
......@@ -271,14 +273,14 @@ GNUMERIC_GNOME = \
sheet-object-item.c \
sheet-object-item.h
# old dead code that is archived in cvs
# it was disabled when we jumped to GtkAction
# wbc-bonobo.c \
# workbook-control-component.c \
# workbook-control-component.h \
# workbook-control-component-priv.h
## old dead code that is archived in cvs
## it was disabled when we jumped to GtkAction
## wbc-bonobo.c \
## workbook-control-component.c \
## workbook-control-component.h \
## workbook-control-component-priv.h
GNUMERIC_SOURCE = $(GNUMERIC_BASE)
GNUMERIC_SOURCE = $(GNUMERIC_BASE)
gnumeric_SOURCES = \
$(GNUMERIC_SOURCE) \
......@@ -325,20 +327,24 @@ ssindex_SOURCES = \
$(GNUMERIC_SOURCE) \
ssindex.c
#test_pango_LDADD = $(gnumeric_LDADD)
#test_pango_LDFLAGS = -export-dynamic
#test_pango_SOURCES = \
# $(GNUMERIC_SOURCE) \
# test-pango.c
gnm-marshalers.h : gnm-marshalers.list $(GLIB_GENMARSHAL)
$(GLIB_GENMARSHAL) $< --header --prefix=gnm_ > $@
gnm-marshalers.c : gnm-marshalers.list $(GLIB_GENMARSHAL)
$(GLIB_GENMARSHAL) $< --body --prefix=gnm_ > $@.tmp
echo '/* This file has been automatically generated. Do not edit. */' >$@
echo '#include "'$*.h'"' >>$@
cat $@.tmp >>$@
rm -f $@.tmp
##test_pango_LDADD = $(gnumeric_LDADD)
##test_pango_LDFLAGS = -export-dynamic
##test_pango_SOURCES = \
## $(GNUMERIC_SOURCE) \
## test-pango.c
##nodist_test_pango_SOURCES = $(nodist_gnumeric_SOURCES)
# Rules for the marshalers code:
GENMARSHAL_COMMAND = $(GLIB_GENMARSHAL) --prefix=gnm_
SUFFIXES = .list
.list.h: $(GLIB_GENMARSHAL)
$(GENMARSHAL_COMMAND) --header $< >$@
.list.c: $(GLIB_GENMARSHAL)
(echo '/* This file has been automatically generated. Do not edit. */' && \
echo '#include "$*.h"' && \
$(GENMARSHAL_COMMAND) --body $< ) >$@
gnumeric-paths.h: gnumeric-paths.sh
@sh $< > $@.tmp ; \
......@@ -362,28 +368,22 @@ uninstall-hook:
-cd $(DESTDIR)$(bindir) && \
rm -f gnumeric-$(VERSION)$(EXEEXT)
# do not include the paths in the tarball
dist-hook :
-rm -f $(distdir)/gnumeric-paths.h $(distdir)/gnumeric-paths.sh
# include conditional files to ensure everything gets distributed no matter
# what the build
EXTRA_DIST = GNOME_Gnumeric-gtk.xml.in \
gnm-marshalers.list \
main-application.c \
main-component.c \
$(GNUMERIC_GNOME) README.gnm_float \
gnumeric-paths.sh.in ssconvert.c ssindex.c gnumeric.rc
gnumeric-paths.sh.in gnumeric.rc
DISTCLEANFILES = GNOME_Gnumeric-gtk.xml
#number_match_SOURCES = number-match.c formats.c dates.c number-match-test.c
##number_match_SOURCES = number-match.c formats.c dates.c number-match-test.c
#number_match_LDADD = \
# $(GNOME_LIBDIR) \
# $(GNOMEUI_LIBS) \
# $(GNOME_XML_LIB) \
# $(INTLLIBS)
##number_match_LDADD = \
## $(GNOME_LIBDIR) \
## $(GNOMEUI_LIBS) \
## $(GNOME_XML_LIB) \
## $(INTLLIBS)
gtkactiondir=$(gnumeric_datadir)
gtkaction_DATA = GNOME_Gnumeric-gtk.xml
......@@ -391,18 +391,19 @@ gtkaction_DATA = GNOME_Gnumeric-gtk.xml
GNOME_Gnumeric-gtk.xml: GNOME_Gnumeric-gtk.xml.in
sed -e 's/ _name *=/ name=/' <$< >$@
# Bonobo requires things to be in a subdir of this form
#bonobo_component_uidir=$(gnumeric_datadir)/gnome-2.0/ui
#bonobo_component_ui_DATA = GNOME_Gnumeric.xml GNOME_Gnumeric_Component.xml
#if ENABLE_BONOBO_COMPONENT
#libexec_PROGRAMS = gnumeric-component
#gnumeric_component_SOURCES = \
# $(GNUMERIC_SOURCE) \
# main-component.c
#
#gnumeric_component_LDADD = $(gnumeric_LDADD)
#
#gnumeric_component_LDFLAGS = -export-dynamic
#
#gnumeric_component_app_libs = $(gnumeric_app_libs)
#endif
## Bonobo requires things to be in a subdir of this form
##bonobo_component_uidir=$(gnumeric_datadir)/gnome-2.0/ui
##bonobo_component_ui_DATA = GNOME_Gnumeric.xml GNOME_Gnumeric_Component.xml
##if ENABLE_BONOBO_COMPONENT
##libexec_PROGRAMS = gnumeric-component
##gnumeric_component_SOURCES = \
## $(GNUMERIC_SOURCE) \
## main-component.c
##nodist_gnumeric_component_SOURCES = $(nodist_gnumeric_SOURCES)
##
##gnumeric_component_LDADD = $(gnumeric_LDADD)
##
##gnumeric_component_LDFLAGS = -export-dynamic
##
##gnumeric_component_app_libs = $(gnumeric_app_libs)
##endif
noinst_LTLIBRARIES = libgoffice-utils.la
libgoffice_utils_la_SOURCES = \
$(BUILT_SOURCES) \
go-marshalers.list \
\
goffice-utils.h \
go-color.c \
......@@ -42,19 +42,22 @@ libgoffice_utils_la_SOURCES = \
go-libxml-extras.c \
go-libxml-extras.h
go-marshalers.h : go-marshalers.list $(GLIB_GENMARSHAL)
$(GLIB_GENMARSHAL) $< --header --prefix=go_ > $@
go-marshalers.c : go-marshalers.list $(GLIB_GENMARSHAL)
$(GLIB_GENMARSHAL) $< --body --prefix=go_ > $@.tmp
echo '/* This file has been automatically generated. Do not edit. */' >$@
echo '#include "'$*.h'"' >>$@
cat $@.tmp >>$@
rm -f $@.tmp
BUILT_SOURCES = \
go-marshalers.h \
CLEANFILES = \
go-marshalers.h \
go-marshalers.c
EXTRA_DIST = go-marshalers.list
# A hint is needed to build the header first:
BUILT_SOURCES = go-marshalers.h
GENMARSHAL_COMMAND = $(GLIB_GENMARSHAL) --prefix=go_
SUFFIXES = .list
.list.h: $(GLIB_GENMARSHAL)
$(GENMARSHAL_COMMAND) --header $< >$@
.list.c: $(GLIB_GENMARSHAL)
(echo '/* This file has been automatically generated. Do not edit. */' && \
echo '#include "$*.h"' && \
$(GENMARSHAL_COMMAND) --body $< ) >$@
include $(srcdir)/../goffice.mk
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