sorry, I forgot the patch
On Sat, 2001-10-06 at 01:42, Rodrigo Moya wrote:
> On Fri, 2001-10-05 at 23:42, Zbigniew Chyla wrote:
> > On Fri, 2001-10-05 at 16:51:59, Ettore Perazzoli wrote:
> >
> > > That's also the right solution. I have committed this patch to CVS a
> > > few minutes ago.
> >
> > Could you also take a look at gtkhtml? It seems to be a bit more
> > complicated:
> >
> > ...
> > Running automake --gnu ...
> > components/html-editor/Makefile.am: CLEANFILES must be set with =' before
> > using +='
> > configure.in:25: LDFLAGS was set with +=' and is now set with ='
> > src/Makefile.am:210: testgtkhtml_CFLAGS multiply defined in condition TRUE
> >
> > testgtkhtml_CFLAGS (User, where = 210) =
> > {
> > TRUE => $(GLIBWWW_CFLAGS)
> > }
> > **Error**: automake failed.
> >
> >
> > After changing two lines...
> >
> > diff -u -r1.53 Makefile.am
> > --- components/html-editor/Makefile.am 2001/10/04 23:09:01 1.53
> > +++ components/html-editor/Makefile.am 2001/10/05 21:24:34
> > @@ -171,7 +171,7 @@
> > idldir = $(datadir)/gtkhtml
> > idl_DATA = $(IDLS)
> >
> > -CLEANFILES += $(IDL_GENERATED) $(SPELL_IDL_GENERATED)
> > +CLEANFILES = $(IDL_GENERATED) $(SPELL_IDL_GENERATED)
> > BUILT_SOURCE = $(IDL_GENERATED) $(SPELL_IDL_GENERATED)
> >
> > dist-hook:
> > diff -u -r1.111 Makefile.am
> > --- src/Makefile.am 2001/09/21 17:28:16 1.111
> > +++ src/Makefile.am 2001/10/05 21:24:35
> > @@ -220,7 +220,6 @@
> >
> > gtest_SOURCES = \
> > test.c
> > -testgtkhtml_CFLAGS =
> > gtest_LDADD = \
> > libgtkhtml.la \
> > $(GNOMEUI_LIBS) \
> >
> >
> > ... I still get:
> >
> > ...
> > Running automake --gnu ...
> > configure.in:25: LDFLAGS was set with +=' and is now set with ='
> > **Error**: automake failed.
> >
> yes, I also had this one. Here's a patch for what I did to fix it on my
> system. This time, Ettore, I won't believe this is the real solution,
> except for the 'if GLIBWWW ... endif' stuff I added.
>
> cheers
> --
> Rodrigo Moya <[EMAIL PROTECTED]> - <[EMAIL PROTECTED]>
> http://www.gnome-db.org/ - http://www.ximian.com/
--
Rodrigo Moya <[EMAIL PROTECTED]> - <[EMAIL PROTECTED]>
http://www.gnome-db.org/ - http://www.ximian.com/
--
Rodrigo Moya <[EMAIL PROTECTED]> - <[EMAIL PROTECTED]>
http://www.gnome-db.org/ - http://www.ximian.com/
? stamp-h1
? doc/gtkhtml-undocumented.txt
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gtkhtml/configure.in,v
retrieving revision 1.140
diff -u -r1.140 configure.in
--- configure.in 2001/10/02 00:12:35 1.140
+++ configure.in 2001/10/05 23:38:50
@@ -22,7 +22,8 @@
AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
-AC_SUBST(LDFLAGS)
+dnl AC_SUBST(LDFLAGS)
+LDFLAGS += ${LDFLAGS}
ALL_LINGUAS="az cs da de el es fi fr gl hu it ja ko lt nl nn no pl pt_BR ru sk sl sv
tr uk zh_TW"
AM_GNOME_GETTEXT
Index: components/html-editor/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/Makefile.am,v
retrieving revision 1.52
diff -u -r1.52 Makefile.am
--- components/html-editor/Makefile.am 2001/08/13 17:52:41 1.52
+++ components/html-editor/Makefile.am 2001/10/05 23:38:52
@@ -47,7 +47,7 @@
$(ORBIT_IDL) -I$(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \
-I$(srcdir) $(srcdir)/Spell.idl
-LDFLAGS += -dynamic
+#LDFLAGS = -dynamic
LDADD = \
$(top_builddir)/src/libgtkhtml.la \
@@ -169,7 +169,7 @@
idldir = $(datadir)/gtkhtml
idl_DATA = $(IDLS)
-CLEANFILES += $(IDL_GENERATED) $(SPELL_IDL_GENERATED)
+CLEANFILES = $(IDL_GENERATED) $(SPELL_IDL_GENERATED)
BUILT_SOURCE = $(IDL_GENERATED) $(SPELL_IDL_GENERATED)
dist-hook:
Index: doc/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtkhtml/doc/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- doc/Makefile.am 2001/01/25 16:13:28 1.2
+++ doc/Makefile.am 2001/10/05 23:38:53
@@ -10,7 +10,7 @@
DOC_SOURCE_DIR=$(top_srcdir)/src
CFLAGS += $(EXTRA_GNOME_CFLAGS)
-LDFLAGS += $(EXTRA_GNOME_LIBS)
+LD_FLAGS = $(EXTRA_GNOME_LIBS)
HTML_DIR=$(datadir)/gnome/html
@@ -53,7 +53,7 @@
scan:
-(cd $(srcdir) \
- && env CFLAGS="$(CFLAGS) -I$(top_srcdir)/src" LDFLAGS="$(LDFLAGS)
-L$(top_srcdir) -lgtkhtml" \
+ && env CFLAGS="$(CFLAGS) -I$(top_srcdir)/src" LDFLAGS="$(LD_FLAGS)
+-L$(top_srcdir) -lgtkhtml" \
gtkdoc-scanobj --module=$(DOC_MODULE) \
&& gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
--ignore-headers="")
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/Makefile.am,v
retrieving revision 1.111
diff -u -r1.111 Makefile.am
--- src/Makefile.am 2001/09/21 17:28:16 1.111
+++ src/Makefile.am 2001/10/05 23:38:54
@@ -201,7 +201,7 @@
libgtkhtml_la_LIBADD = $(EXTRA_GNOME_LIBS) $(GCONF_LIBS)
# The test program.
-
+if GLIBWWW
testgtkhtml_SOURCES = \
testgtkhtml.c \
htmlurl.h \
@@ -220,13 +220,13 @@
gtest_SOURCES = \
test.c
-testgtkhtml_CFLAGS =
gtest_LDADD = \
libgtkhtml.la \
$(GNOMEUI_LIBS) \
$(GNOME_LIBDIR) \
$(GCONF_LIBS) \
$(EXTRA_GNOME_LIBS)
+endif
dist-hook:
mkdir $(distdir)/tests
