From 5cd24966b709de7c75a83018297d8dfb3481ddb0 Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Thu, 15 Apr 2010 11:41:09 -0400 Subject: fixed autotools build * some file moved from codegen to codegen/libcodegen - create Makefile.am in libcodegen dir - remove refs to files and add the libcodegen subdir in codegen/Makefile.am * add AM_MAINTAINER_MODE to configure.ac - allows ./autogen.sh to be run without flags --- codegen/Makefile.am | 11 ++--------- codegen/libcodegen/Makefile.am | 13 +++++++++++++ configure.ac | 2 ++ 3 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 codegen/libcodegen/Makefile.am diff --git a/codegen/Makefile.am b/codegen/Makefile.am index cdb1e99..572fab2 100644 --- a/codegen/Makefile.am +++ b/codegen/Makefile.am @@ -1,5 +1,7 @@ PLATFORM_VERSION = 2.0 +SUBDIRS = libcodegen + bin_SCRIPTS = pygobject-codegen-$(PLATFORM_VERSION) codegendir = $(pkgdatadir)/$(PLATFORM_VERSION)/codegen @@ -19,13 +21,4 @@ codegen_SCRIPTS = \ scanvirtuals.py \ scmexpr.py -codegen_PYTHON = \ - __init__.py \ - argtypes.py \ - definitions.py \ - defsparser.py \ - docextract.py \ - override.py \ - reversewrapper.py - EXTRA_DIST = $(codegen_SCRIPTS) README.defs pygobject-codegen-$(PLATFORM_VERSION).in diff --git a/codegen/libcodegen/Makefile.am b/codegen/libcodegen/Makefile.am new file mode 100644 index 0000000..cbf227c --- /dev/null +++ b/codegen/libcodegen/Makefile.am @@ -0,0 +1,13 @@ +PLATFORM_VERSION = 2.0 + +libcodegendir = $(pkgdatadir)/$(PLATFORM_VERSION)/codegen/libcodegen +libcodegen_SCRIPTS = \ + __init__.py \ + argtypes.py \ + definitions.py \ + defsparser.py \ + docextract.py \ + override.py \ + reversewrapper.py + +EXTRA_DIST = $(libcodegen_SCRIPTS) diff --git a/configure.ac b/configure.ac index 92695b6..416c896 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,7 @@ AC_CONFIG_SRCDIR([gobject/gobjectmodule.c]) AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE +AM_MAINTAINER_MODE dnl put the ACLOCAL flags in the makefile ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" @@ -228,6 +229,7 @@ AC_CONFIG_FILES( pygobject-2.0-uninstalled.pc codegen/Makefile codegen/pygobject-codegen-2.0 + codegen/libcodegen/Makefile docs/Makefile docs/reference/entities.docbook docs/xsl/fixxref.py -- cgit