[lasem] Support out-of-source-directory build



commit c95bc2ca2053f315f87050ca685b692e0672f667
Author: J.H.M. Dassen (Ray) <jdassen debian org>
Date:   Sun Nov 4 15:15:01 2012 +0100

    Support out-of-source-directory build

 autogen.sh      |    3 ++-
 src/Makefile.am |   15 +++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index cce3807..84ab592 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,12 +20,13 @@ fi
     exit 1
 }
 
+topdir=$(dirname $0)
 GTKDOCIZE=`which gtkdocize`
 if test -z $GTKDOCIZE; then
         echo "*** No gtk-doc support ***"
         echo "EXTRA_DIST =" > gtk-doc.make
 else
-        gtkdocize || exit $?
+        (cd $topdir && gtkdocize) || exit $?
         # we need to patch gtk-doc.make to support pretty output with
         # libtool 1.x.  Should be fixed in the next version of gtk-doc.
         # To be more resilient with the various versions of gtk-doc one
diff --git a/src/Makefile.am b/src/Makefile.am
index af15f51..c534788 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,7 +37,6 @@ LASEM_DOM_SRCS =				\
 	lsmproperties.c				\
 	lsmattributes.c				\
 	lsmcairo.c				\
-	lsmdomenumtypes.c			\
 	lsmdomentities.c			\
 	lsmdomnode.c				\
 	lsmdomnodelist.c			\
@@ -51,6 +50,10 @@ LASEM_DOM_SRCS =				\
 	lsmdomparser.c				\
 	lsmdomimplementation.c
 
+LASEM_DOM_BUILT_SRCS =				\
+	lsmdomenumtypes.c			\
+	lsmdomenumtypes.h
+
 LASEM_MATHML_SRCS =				\
 	lsmmathmlenumtypes.c			\
 	lsmmathmlenums.c			\
@@ -258,7 +261,7 @@ LASEM_SVG_HDRS =				\
 
 liblasem_ LASEM_API_VERSION@_ladir = $(includedir)/lasem- LASEM_API_VERSION@
 
-liblasem_ LASEM_API_VERSION@_la_SOURCES = $(LASEM_DOM_SRCS) $(LASEM_MATHML_SRCS) $(LASEM_SVG_SRCS)
+liblasem_ LASEM_API_VERSION@_la_SOURCES = $(LASEM_DOM_SRCS) $(LASEM_DOM_BUILT_SRCS) $(LASEM_MATHML_SRCS) $(LASEM_SVG_SRCS)
 liblasem_ LASEM_API_VERSION@_la_SOURCES +=  $(LASEM_MATHML_HDRS) $(LASEM_SVG_HDRS)
 liblasem_ LASEM_API_VERSION@_la_SOURCES += lsmmathmlenumtypes.h lsmsvgenumtypes.h
 
@@ -305,9 +308,9 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 if HAVE_INTROSPECTION
 
 introspection_files = $(LASEM_DOM_SRCS) \
-		      $(LASEM_DOM_HDRS) \
-		      lsmdomenumtypes.c	\
-		      lsmdomenumtypes.h
+		      $(LASEM_DOM_HDRS)
+
+introspection_built_files = $(LASEM_DOM_BUILT_SRCS)
 
 Lasem- LASEM_API_VERSION@.gir: $(INTROSPECTION_SCANNER) liblasem- LASEM_API_VERSION@.la Makefile
 
@@ -315,7 +318,7 @@ Lasem_ LASEM_API_VERSION_U@_gir_INCLUDES = GObject-2.0 cairo-1.0 Gio-2.0 Pango-1
 Lasem_ LASEM_API_VERSION_U@_gir_SCANNERFLAGS = --identifier-prefix=Lsm --warn-all
 Lasem_ LASEM_API_VERSION_U@_gir_CFLAGS = $(INCLUDES) -I$(top_srcdir)/src
 Lasem_ LASEM_API_VERSION_U@_gir_LIBS = liblasem- LASEM_API_VERSION@.la
-Lasem_ LASEM_API_VERSION_U@_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files))
+Lasem_ LASEM_API_VERSION_U@_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files)) $(addprefix $(top_builddir)/src/,$(introspection_built_files))
 
 INTROSPECTION_GIRS += Lasem- LASEM_API_VERSION@.gir
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]