Re: More cleaning patch
Régis Boudin <[email protected]>
| Newsgroups | gmane.comp.web.amaya.devel |
|---|---|
| Message-ID | <[email protected]> |
On Mon, 2006-11-13 at 17:01 +0200, Irene Vatton wrote: > > Additionally, raptor_cleanup.diff applies on top of cleanup, removing > > the reference to libraptor.a (which is already linked inside librdf.a) > > and the system to build raptor, which is completely useless. Even if it > > is called, the only bit making reference what gets built in is commented > > in amaya/Makefile.in. > > When I apply this patch, raptor modules inside redland don't compile and the > Amaya version cannot be generated. Well, the raptor module inside redland is built, but I was tricked by the way libtool works. libraptor.a is ont actually linked in librdf.a, but only referenced in librdf.la. The attached patch should fix the problem. > > Last, redland_configure_in_configure.diff moves the call to configure > > for Redland from the Makefile.in to configure.in, in line with what is > > done for Mesa and WxWidgets. > > Not applied due to previous problem. I have another problem with this one, so I need to work a bit more on it. Regards, Regis
raptor_cleanup.diff
(text/x-patch, 2.8 KB)
Index: Amaya/configure.in =================================================================== --- Amaya.orig/configure.in 2006-11-14 22:19:12.933994382 +0000 +++ Amaya/configure.in 2006-11-14 22:51:06.021554882 +0000 @@ -1359,7 +1359,6 @@ AC_SUBST(WITHDAV) AC_SUBST(WWWDAV) -AC_SUBST(MAKERAPTOR) AC_SUBST(MAKEREDLAND) AC_SUBST(ANNOTLIB_COMPILE_BM) AC_SUBST(AMAYA_RAPTOR_SRC) Index: Amaya/Makefile.in =================================================================== --- Amaya.orig/Makefile.in 2006-11-14 22:17:59.693417132 +0000 +++ Amaya/Makefile.in 2006-11-14 22:19:16.214199382 +0000 @@ -12,14 +12,13 @@ include Options LIBWWW = libwww -LIBRAPTOR = libraptor REDLAND = redland LIBJPEG = libjpeg LIBPNG = libpng #MKP: adding davlib SUBDIRS = @SUBDIRS@ tools thotlib batch drawlib indexlib annotlib amaya thot @DAVDIR@ -EXTRA_SUBDIRS= misc pluginlib $(LIBRAPTOR) $(REDLAND) $(LIBWWW) $(WX_BUILDDIR) $(GL_BUILDDIR) +EXTRA_SUBDIRS= misc pluginlib $(REDLAND) $(LIBWWW) $(WX_BUILDDIR) $(GL_BUILDDIR) prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -294,51 +293,6 @@ @($(ECHO) "libwww is installed") # -# Rules to build the raptor RDF package -# - -libraptor_config: @MAKERAPTOR@ force - @(if [ ! -e "$(THOTDIR)/$(LIBRAPTOR)" ] ; then \ - $(ECHO) "Error raptor dir not found at $(THOTDIR)/$(LIBRAPTOR)" ; \ - fi) - @(if [ ! -e "$(THOTDIR)/$(LIBRAPTOR)/expat" ] ; then \ - libwwwdir="$(THOTDIR)/../$(LIBWWW)" ; \ - echo $$libwwwdir ; \ - $(LN_S) "$$libwwwdir/modules/expat" "$(THOTDIR)/$(LIBRAPTOR)/expat" ; \ - fi) - @(if [ ! -d "$(LIBRAPTOR)" ] ; then \ - $(MKDIR) $(LIBRAPTOR) ; \ - fi) - @(localdir=`pwd` ; raptordir="$$localdir/../$(LIBRAPTOR)" ; \ - cd $(LIBRAPTOR) ; unset LANG; \ - if [ ! -f Makefile -o ! -f config.h ] ; then \ - CFLAGS="-I$$raptordir/expat/lib" \ - $$raptordir/configure \ - --build=@build_alias@ --host=@host_alias@ --target=@target_alias@ \ - --without-shared \ - --with-expat ; \ - $(ECHO) "patching libraptor/libtool because -flat_namespace option is missing and do not compile on macosx" ; \ - $(CP) libtool libtool.orig ; \ - $(SED) "s/\(allow_undefined_flag=\"-undefined suppress\)/\1 -flat_namespace/" \ - libtool.orig > libtool ; \ - $(ECHO) "libraptor/libtool patched !" ; \ - $(ECHO) "libraptor is configured" ; \ - fi) - -libraptor_make: @MAKERAPTOR@ force - @(localdir=`pwd`; \ - cd $(LIBRAPTOR) ; \ - if [ ! -e .libs/libraptor.a -a -e libraptor.la ] ; then \ - $(RM) libraptor.la ; \ - fi ; \ - $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) -I$$localdir/../$(LIBRAPTOR)/expat/lib " \ - CPPFLAGS="$(CPPFLAGS)" \ - ) - -libraptor: @MAKERAPTOR@ libraptor_config libraptor_make - @($(ECHO) "libraptor is installed") - -# # Rules to build the redland RDF library #