Commit 46bf6d8a authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

added a new conditional CROSS_COMPILING which indicates ($build != $host).

2002-05-07  Michael Natterer  <mitch@gimp.org>

	* configure.in: added a new conditional CROSS_COMPILING which
	indicates ($build != $host). If it is set, look for
	glib-genmarshal in PATH. Error out if it was not found.

2002-05-07  Michael Natterer  <mitch@gimp.org>

	* Makefile.am: use the glib-genmarshal found at configure time
	if CROSS_COMPILING is set, use the one which was just built
	otherwise.
parent 053a1ce4
2002-05-07 Michael Natterer <mitch@gimp.org>
* configure.in: added a new conditional CROSS_COMPILING which
indicates ($build != $host). If it is set, look for
glib-genmarshal in PATH. Error out if it was not found.
Tue May 7 11:24:22 2002 Owen Taylor <otaylor@redhat.com> Tue May 7 11:24:22 2002 Owen Taylor <otaylor@redhat.com>
Fixes for #79347, Ron Arts. Fixes for #79347, Ron Arts.
......
2002-05-07 Michael Natterer <mitch@gimp.org>
* configure.in: added a new conditional CROSS_COMPILING which
indicates ($build != $host). If it is set, look for
glib-genmarshal in PATH. Error out if it was not found.
Tue May 7 11:24:22 2002 Owen Taylor <otaylor@redhat.com> Tue May 7 11:24:22 2002 Owen Taylor <otaylor@redhat.com>
Fixes for #79347, Ron Arts. Fixes for #79347, Ron Arts.
......
2002-05-07 Michael Natterer <mitch@gimp.org>
* configure.in: added a new conditional CROSS_COMPILING which
indicates ($build != $host). If it is set, look for
glib-genmarshal in PATH. Error out if it was not found.
Tue May 7 11:24:22 2002 Owen Taylor <otaylor@redhat.com> Tue May 7 11:24:22 2002 Owen Taylor <otaylor@redhat.com>
Fixes for #79347, Ron Arts. Fixes for #79347, Ron Arts.
......
2002-05-07 Michael Natterer <mitch@gimp.org>
* configure.in: added a new conditional CROSS_COMPILING which
indicates ($build != $host). If it is set, look for
glib-genmarshal in PATH. Error out if it was not found.
Tue May 7 11:24:22 2002 Owen Taylor <otaylor@redhat.com> Tue May 7 11:24:22 2002 Owen Taylor <otaylor@redhat.com>
Fixes for #79347, Ron Arts. Fixes for #79347, Ron Arts.
......
2002-05-07 Michael Natterer <mitch@gimp.org>
* configure.in: added a new conditional CROSS_COMPILING which
indicates ($build != $host). If it is set, look for
glib-genmarshal in PATH. Error out if it was not found.
Tue May 7 11:24:22 2002 Owen Taylor <otaylor@redhat.com> Tue May 7 11:24:22 2002 Owen Taylor <otaylor@redhat.com>
Fixes for #79347, Ron Arts. Fixes for #79347, Ron Arts.
......
2002-05-07 Michael Natterer <mitch@gimp.org>
* configure.in: added a new conditional CROSS_COMPILING which
indicates ($build != $host). If it is set, look for
glib-genmarshal in PATH. Error out if it was not found.
Tue May 7 11:24:22 2002 Owen Taylor <otaylor@redhat.com> Tue May 7 11:24:22 2002 Owen Taylor <otaylor@redhat.com>
Fixes for #79347, Ron Arts. Fixes for #79347, Ron Arts.
......
2002-05-07 Michael Natterer <mitch@gimp.org>
* configure.in: added a new conditional CROSS_COMPILING which
indicates ($build != $host). If it is set, look for
glib-genmarshal in PATH. Error out if it was not found.
Tue May 7 11:24:22 2002 Owen Taylor <otaylor@redhat.com> Tue May 7 11:24:22 2002 Owen Taylor <otaylor@redhat.com>
Fixes for #79347, Ron Arts. Fixes for #79347, Ron Arts.
......
...@@ -1582,6 +1582,19 @@ int error = EILSEQ; ...@@ -1582,6 +1582,19 @@ int error = EILSEQ;
], have_eilseq=yes, have_eilseq=no); ], have_eilseq=yes, have_eilseq=no);
AC_MSG_RESULT($have_eilseq) AC_MSG_RESULT($have_eilseq)
dnl ******************************************************************
dnl *** Look for glib-genmarshal in PATH if we are cross-compiling ***
dnl ******************************************************************
AM_CONDITIONAL(CROSS_COMPILING, test $build != $host)
if test $CROSS_COMPILING; then
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, no)
if test x$GLIB_GENMARSHAL = xno; then
AC_MSG_ERROR(Could not find a glib-genmarshal in your PATH)
fi
fi
dnl ************************** dnl **************************
dnl *** Checks for gtk-doc *** dnl *** Checks for gtk-doc ***
dnl ************************** dnl **************************
......
2002-05-07 Michael Natterer <mitch@gimp.org>
* Makefile.am: use the glib-genmarshal found at configure time
if CROSS_COMPILING is set, use the one which was just built
otherwise.
Mon May 6 16:06:23 2002 Owen Taylor <otaylor@redhat.com> Mon May 6 16:06:23 2002 Owen Taylor <otaylor@redhat.com>
[ merged from stable ] [ merged from stable ]
......
...@@ -148,22 +148,30 @@ $(libgobject_2_0_la_OBJECTS): $(gobject_built_sources) ${gobject_built_public_s ...@@ -148,22 +148,30 @@ $(libgobject_2_0_la_OBJECTS): $(gobject_built_sources) ${gobject_built_public_s
# initial creation of the real stamp-* files # initial creation of the real stamp-* files
gmarshal.h: # never add deps here gmarshal.h: # never add deps here
test -f "$(srcdir)/$@" || touch $(srcdir)/$@ test -f "$(srcdir)/$@" || touch $(srcdir)/$@
# normal autogeneration rules # normal autogeneration rules
# all autogenerated files need to be generated in the srcdir, # all autogenerated files need to be generated in the srcdir,
# so old versions get remade and are not confused with newer # so old versions get remade and are not confused with newer
# versions in the build dir. thus a development setup requires # versions in the build dir. thus a development setup requires
# srcdir to be writable, passing --disable-rebuilds to # srcdir to be writable, passing --disable-rebuilds to
# ../configure will supress all autogeneration rules. # ../configure will supress all autogeneration rules.
if CROSS_COMPILING
glib_genmarshal=$(GLIB_GENMARSHAL)
else
glib_genmarshal=./glib-genmarshal
endif
$(srcdir)/stamp-gmarshal.h: @REBUILD@ gmarshal.list gmarshal.h glib-genmarshal$(EXEEXT) $(srcdir)/stamp-gmarshal.h: @REBUILD@ gmarshal.list gmarshal.h glib-genmarshal$(EXEEXT)
echo "#ifndef __G_MARSHAL_H__" > xgen-gmh \ echo "#ifndef __G_MARSHAL_H__" > xgen-gmh \
&& echo "#define __G_MARSHAL_H__" >> xgen-gmh \ && echo "#define __G_MARSHAL_H__" >> xgen-gmh \
&& ./glib-genmarshal --nostdinc --prefix=g_cclosure_marshal $(srcdir)/gmarshal.list --header >> xgen-gmh \ && $(glib_genmarshal) --nostdinc --prefix=g_cclosure_marshal $(srcdir)/gmarshal.list --header >> xgen-gmh \
&& echo "#endif /* __G_MARSHAL_H__ */" >> xgen-gmh \ && echo "#endif /* __G_MARSHAL_H__ */" >> xgen-gmh \
&& (cmp -s xgen-gmh $(srcdir)/gmarshal.h || cp xgen-gmh $(srcdir)/gmarshal.h) \ && (cmp -s xgen-gmh $(srcdir)/gmarshal.h || cp xgen-gmh $(srcdir)/gmarshal.h) \
&& rm -f xgen-gmh xgen-gmh~ \ && rm -f xgen-gmh xgen-gmh~ \
&& echo timestamp > $@ && echo timestamp > $@
$(srcdir)/gmarshal.c: @REBUILD@ $(srcdir)/stamp-gmarshal.h $(srcdir)/gmarshal.c: @REBUILD@ $(srcdir)/stamp-gmarshal.h
./glib-genmarshal --nostdinc --prefix=g_cclosure_marshal $(srcdir)/gmarshal.list --body >> xgen-gmc \ $(glib_genmarshal) --nostdinc --prefix=g_cclosure_marshal $(srcdir)/gmarshal.list --body >> xgen-gmc \
&& cp xgen-gmc $(srcdir)/gmarshal.c \ && cp xgen-gmc $(srcdir)/gmarshal.c \
&& rm -f xgen-gmc xgen-gmc~ && rm -f xgen-gmc xgen-gmc~
$(srcdir)/gmarshal.strings: @REBUILD@ $(srcdir)/gmarshal.list $(srcdir)/gmarshal.strings: @REBUILD@ $(srcdir)/gmarshal.list
......
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