[valadoc] build: Avoid shipping generated c-code in tarball
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [valadoc] build: Avoid shipping generated c-code in tarball
- Date: Thu, 16 Jan 2014 18:39:39 +0000 (UTC)
commit 2008722b83c5d2995e7f653057e501a4ae02c186
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Thu Jan 16 19:36:56 2014 +0100
build: Avoid shipping generated c-code in tarball
Also clean up and refactor Makefiles on the way.
icons/Makefile.am | 67 +++++++++++-------------
src/Makefile.am | 7 ++-
src/doclets/Makefile.am | 12 ++---
src/doclets/devhelp/Makefile.am | 49 ++++++++++---------
src/doclets/gtkdoc/Makefile.am | 60 ++++++++++++----------
src/doclets/htm/Makefile.am | 61 ++++++++++-------------
src/driver/0.14.x/Makefile.am | 49 ++++++++++--------
src/driver/0.16.x/Makefile.am | 52 ++++++++++---------
src/driver/0.18.x/Makefile.am | 52 ++++++++++---------
src/driver/0.20.x/Makefile.am | 49 ++++++++++--------
src/driver/0.22.x/Makefile.am | 49 ++++++++++--------
src/driver/0.24.x/Makefile.am | 49 ++++++++++--------
src/driver/Makefile.am | 3 -
src/libvaladoc/Makefile.am | 105 +++++++++++++++++++++------------------
src/valadoc/Makefile.am | 71 +++++++++++++++-----------
15 files changed, 384 insertions(+), 351 deletions(-)
---
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 4859e24..454bdba 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,43 +1,38 @@
NULL =
-
iconsdir = $(datadir)/valadoc/icons
-
-dist_icons_DATA = \
- tip.png \
- warning.png \
- abstractclass.png \
- abstractmethod.png \
- staticmethod.png \
- devhelpstyle.css \
- wikistyle.css \
- style.css \
- class.png \
- interface.png \
- packages.png \
- constant.png \
- method.png \
- property.png \
- delegate.png \
- errordomain.png \
- errorcode.png \
- namespace.png \
- signal.png \
- enum.png \
- enumvalue.png \
- field.png \
- package.png \
- struct.png \
+dist_icons_DATA = \
+ abstractclass.png \
+ abstractmethod.png \
abstractproperty.png \
- constructor.png \
- virtualmethod.png \
- virtualproperty.png \
- scripts.js \
- coll_close.png \
- coll_open.png \
+ class.png \
+ coll_close.png \
+ coll_open.png \
+ constant.png \
+ constructor.png \
+ delegate.png \
+ devhelpstyle.css \
+ enum.png \
+ enumvalue.png \
+ errorcode.png \
+ errordomain.png \
+ field.png \
+ interface.png \
+ method.png \
+ namespace.png \
+ package.png \
+ packages.png \
+ property.png \
+ scripts.js \
+ signal.png \
+ staticmethod.png \
+ struct.png \
+ style.css \
+ tip.png \
+ virtualmethod.png \
+ virtualproperty.png \
+ warning.png \
+ wikistyle.css \
$(NULL)
-
-
-
diff --git a/src/Makefile.am b/src/Makefile.am
index fcaf3a5..63efb92 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,5 @@
-# src/Makefile.am
-
NULL =
-
SUBDIRS = \
libvaladoc \
valadoc \
@@ -10,4 +7,8 @@ SUBDIRS = \
driver \
$(NULL)
+EXTRA_DIST = \
+ vapi/config.vapi \
+ vapi/libgvc.vapi \
+ $(NULL)
diff --git a/src/doclets/Makefile.am b/src/doclets/Makefile.am
index d957a60..840ef98 100644
--- a/src/doclets/Makefile.am
+++ b/src/doclets/Makefile.am
@@ -1,11 +1,9 @@
-# src/Makefile.am
-
NULL =
-
-SUBDIRS = htm \
- devhelp \
- gtkdoc \
- $(NULL)
+SUBDIRS = \
+ htm \
+ devhelp \
+ gtkdoc \
+ $(NULL)
diff --git a/src/doclets/devhelp/Makefile.am b/src/doclets/devhelp/Makefile.am
index 4d30737..78cd549 100644
--- a/src/doclets/devhelp/Makefile.am
+++ b/src/doclets/devhelp/Makefile.am
@@ -1,58 +1,61 @@
NULL =
-
-AM_CFLAGS = -g \
+AM_CFLAGS = \
-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
-I $(top_builddir)/src/libvaladoc/ \
- $(LIBGVC_CFLAGS) \
$(GLIB_CFLAGS) \
$(LIBGEE_CFLAGS) \
+ $(LIBGVC_CFLAGS) \
+ -g \
+ -w \
$(NULL)
-
+AM_VALAFLAGS = \
+ $(VALAFLAGS) \
+ --vapidir $(top_srcdir)/src/vapi \
+ --vapidir $(top_builddir)/src/libvaladoc \
+ --basedir $(srcdir) \
+ --directory $(builddir) \
+ -C \
+ -g \
+ $(NULL)
BUILT_SOURCES = libdoclet.vala.stamp
+doclet_LTLIBRARIES = libdoclet.la
docletdir = $(libdir)/valadoc/doclets/devhelp
-
libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
-
-doclet_LTLIBRARIES = \
- libdoclet.la \
- $(NULL)
-
-
libdoclet_la_VALASOURCES = \
doclet.vala \
$(NULL)
-
-libdoclet_la_SOURCES = \
- libdoclet.vala.stamp \
+nodist_libdoclet_la_SOURCES = \
$(libdoclet_la_VALASOURCES:.vala=.c) \
$(NULL)
-
libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES) Makefile
- $(VALAC) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc --pkg gee-0.8
--pkg valadoc-1.0 $(filter %.vala %.c,$^)
+ $(VALAC) \
+ $(AM_VALAFLAGS) \
+ --pkg gee-0.8 \
+ --pkg valadoc-1.0 \
+ $(filter %.vala %.c,$^)
touch $@
-
libdoclet_la_LIBADD = \
$(top_builddir)/src/libvaladoc/libvaladoc.la \
$(GLIB_LIBS) \
$(LIBGEE_LIBS) \
$(NULL)
-
-EXTRA_DIST = $(libdoclet_la_VALASOURCES) libdoclet.vala.stamp
-
-
-MAINTAINERCLEANFILES = \
- $(libdoclet_la_VALASOURCES:.vala=.c) \
+EXTRA_DIST = \
+ $(libdoclet_la_VALASOURCES) \
$(NULL)
+CLEANFILES = \
+ $(BUILT_SOURCES) \
+ $(nodist_libdoclet_la_SOURCES) \
+ $(NULL)
diff --git a/src/doclets/gtkdoc/Makefile.am b/src/doclets/gtkdoc/Makefile.am
index 48a84d6..f0c4f96 100644
--- a/src/doclets/gtkdoc/Makefile.am
+++ b/src/doclets/gtkdoc/Makefile.am
@@ -1,62 +1,66 @@
NULL =
-
-AM_CFLAGS = -g \
+AM_CFLAGS = \
-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
-I $(top_builddir)/src/libvaladoc/ \
$(GLIB_CFLAGS) \
- $(LIBGVC_CFLAGS) \
$(LIBGEE_CFLAGS) \
+ $(LIBGVC_CFLAGS) \
+ -g \
+ -w \
$(NULL)
-
+AM_VALAFLAGS = \
+ $(VALAFLAGS) \
+ --vapidir $(top_srcdir)/src/vapi \
+ --vapidir $(top_builddir)/src/libvaladoc \
+ --basedir $(srcdir) \
+ --directory $(builddir) \
+ -C \
+ -g \
+ $(NULL)
BUILT_SOURCES = libdoclet.vala.stamp
+doclet_LTLIBRARIES = libdoclet.la
docletdir = $(libdir)/valadoc/doclets/gtkdoc
-
libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
-
-doclet_LTLIBRARIES = \
- libdoclet.la \
- $(NULL)
-
-
libdoclet_la_VALASOURCES = \
- commentconverter.vala \
- dbus.vala \
- doclet.vala \
- gcomment.vala \
- generator.vala \
- utils.vala \
+ commentconverter.vala \
+ dbus.vala \
+ doclet.vala \
+ gcomment.vala \
+ generator.vala \
+ utils.vala \
$(NULL)
-
-libdoclet_la_SOURCES = \
- libdoclet.vala.stamp \
+nodist_libdoclet_la_SOURCES = \
$(libdoclet_la_VALASOURCES:.vala=.c) \
$(NULL)
-
libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES) Makefile
- $(VALAC) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc --pkg gee-0.8
--pkg valadoc-1.0 $(filter %.vala %.c,$^)
+ $(VALAC) \
+ $(AM_VALAFLAGS) \
+ --pkg gee-0.8 \
+ --pkg valadoc-1.0 \
+ $(filter %.vala %.c,$^)
touch $@
-
libdoclet_la_LIBADD = \
$(top_builddir)/src/libvaladoc/libvaladoc.la \
$(GLIB_LIBS) \
$(LIBGEE_LIBS) \
$(NULL)
+EXTRA_DIST = \
+ $(libdoclet_la_VALASOURCES) \
+ $(NULL)
-EXTRA_DIST = $(libdoclet_la_VALASOURCES) libdoclet.vala.stamp
-
-
-MAINTAINERCLEANFILES = \
- $(libdoclet_la_VALASOURCES:.vala=.c) \
+CLEANFILES = \
+ $(BUILT_SOURCES) \
+ $(nodist_libdoclet_la_SOURCES) \
$(NULL)
diff --git a/src/doclets/htm/Makefile.am b/src/doclets/htm/Makefile.am
index 292c547..b9fdee3 100644
--- a/src/doclets/htm/Makefile.am
+++ b/src/doclets/htm/Makefile.am
@@ -1,68 +1,61 @@
NULL =
-
-AM_CFLAGS = -g \
+AM_CFLAGS = \
-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
-I $(top_builddir)/src/libvaladoc/ \
- $(LIBGVC_CFLAGS) \
$(GLIB_CFLAGS) \
$(LIBGEE_CFLAGS) \
+ $(LIBGVC_CFLAGS) \
+ -g \
+ -w \
$(NULL)
-# Without the LIBGVC_CFLAGS, we get
-# make[5]: Entering directory `/home/richard/.local/src/valadoc/src/doclets/devhelp'
-# CC doclet.lo
-# In file included from /usr/include/graphviz/gvc.h:17:0,
-# from ../../libvaladoc/valadoc-1.0.h:15,
-# from doclet.c:28:
-# /usr/include/graphviz/types.h:49:20: fatal error: cgraph.h: No such file or directory
-# #include <cgraph.h>
-# ^
-# compilation terminated.
-
+AM_VALAFLAGS = \
+ $(VALAFLAGS) \
+ --vapidir $(top_srcdir)/src/vapi \
+ --vapidir $(top_builddir)/src/libvaladoc \
+ --basedir $(srcdir) \
+ --directory $(builddir) \
+ -C \
+ -g \
+ $(NULL)
BUILT_SOURCES = libdoclet.vala.stamp
+doclet_LTLIBRARIES = libdoclet.la
docletdir = $(libdir)/valadoc/doclets/html
-
libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
-
-doclet_LTLIBRARIES = \
- libdoclet.la \
- $(NULL)
-
-
libdoclet_la_VALASOURCES = \
- doclet.vala \
+ doclet.vala \
$(NULL)
-
-libdoclet_la_SOURCES = \
- libdoclet.vala.stamp \
+nodist_libdoclet_la_SOURCES = \
$(libdoclet_la_VALASOURCES:.vala=.c) \
$(NULL)
-
libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES) Makefile
- $(VALAC) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc --pkg gee-0.8
--pkg valadoc-1.0 $(filter %.vala %.c,$^)
+ $(VALAC) \
+ $(AM_VALAFLAGS) \
+ --pkg gee-0.8 \
+ --pkg valadoc-1.0 \
+ $(filter %.vala %.c,$^)
touch $@
-
libdoclet_la_LIBADD = \
$(top_builddir)/src/libvaladoc/libvaladoc.la \
$(GLIB_LIBS) \
$(LIBGEE_LIBS) \
$(NULL)
-
-EXTRA_DIST = $(libdoclet_la_VALASOURCES) libdoclet.vala.stamp
-
-
-MAINTAINERCLEANFILES = \
- $(libdoclet_la_VALASOURCES:.vala=.c) \
+EXTRA_DIST = \
+ $(libdoclet_la_VALASOURCES) \
$(NULL)
+CLEANFILES = \
+ $(BUILT_SOURCES) \
+ $(nodist_libdoclet_la_SOURCES) \
+ $(NULL)
diff --git a/src/driver/0.14.x/Makefile.am b/src/driver/0.14.x/Makefile.am
index 60c6e64..c153166 100644
--- a/src/driver/0.14.x/Makefile.am
+++ b/src/driver/0.14.x/Makefile.am
@@ -10,8 +10,7 @@ if HAVE_LIBVALA_0_13_1
VALA_FLAGS = -D VALA_0_13_1
endif
-
-AM_CFLAGS = -g \
+AM_CFLAGS = \
-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
-I $(top_builddir)/src/libvaladoc/ \
$(GLIB_CFLAGS) \
@@ -20,24 +19,29 @@ AM_CFLAGS = -g \
$(LIBVALA_0_14_X_CFLAGS) \
$(LIBVALA_0_13_0_CFLAGS) \
$(LIBVALA_0_13_1_CFLAGS) \
+ -g \
+ -w \
$(NULL)
-
+AM_VALAFLAGS = \
+ $(VALAFLAGS) \
+ --vapidir $(VERSIONED_VAPI_DIR) \
+ --vapidir $(top_srcdir)/src/vapi \
+ --vapidir $(top_srcdir)/src/libvaladoc \
+ --basedir $(srcdir) \
+ --directory $(builddir) \
+ -C \
+ -g \
+ $(NULL)
BUILT_SOURCES = libdriver.vala.stamp
+driver_LTLIBRARIES = libdriver.la
driverdir = $(libdir)/valadoc/drivers/0.14.x
-
libdriver_la_LDFLAGS = -module -avoid-version -no-undefined
-
-driver_LTLIBRARIES = \
- libdriver.la \
- $(NULL)
-
-
libdriver_la_VALASOURCES = \
initializerbuilder.vala \
symbolresolver.vala \
@@ -45,18 +49,19 @@ libdriver_la_VALASOURCES = \
driver.vala \
$(NULL)
-
-libdriver_la_SOURCES = \
- libdriver.vala.stamp \
+nodist_libdriver_la_SOURCES = \
$(libdriver_la_VALASOURCES:.vala=.c) \
$(NULL)
-
libdriver.vala.stamp: $(libdriver_la_VALASOURCES) Makefile
- $(VALAC) $(VALA_FLAGS) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(VERSIONED_VAPI_DIR) --vapidir
$(top_srcdir)/src/libvaladoc --pkg libvala-0.14 --pkg gee-0.8 --pkg valadoc-1.0 $(filter %.vala %.c,$^)
+ $(VALAC) \
+ $(AM_VALAFLAGS) \
+ --pkg libvala-0.14 \
+ --pkg gee-0.8 \
+ --pkg valadoc-1.0 \
+ $(filter %.vala %.c,$^)
touch $@
-
libdriver_la_LIBADD = \
$(top_builddir)/src/libvaladoc/libvaladoc.la \
$(GLIB_LIBS) \
@@ -67,12 +72,12 @@ libdriver_la_LIBADD = \
$(LIBGVC_LIBS) \
$(NULL)
-
-EXTRA_DIST = $(libdriver_la_VALASOURCES) libdriver.vala.stamp
-
-
-MAINTAINERCLEANFILES = \
- $(libdriver_la_VALASOURCES:.vala=.c) \
+EXTRA_DIST = \
+ $(libdriver_la_VALASOURCES) \
$(NULL)
+CLEANFILES = \
+ $(BUILT_SOURCES) \
+ $(nodist_libdriver_la_SOURCES) \
+ $(NULL)
diff --git a/src/driver/0.16.x/Makefile.am b/src/driver/0.16.x/Makefile.am
index b424168..27eb799 100644
--- a/src/driver/0.16.x/Makefile.am
+++ b/src/driver/0.16.x/Makefile.am
@@ -1,16 +1,12 @@
NULL =
-
-
VERSIONED_VAPI_DIR=`pkg-config libvala-0.16 --variable vapidir`
-
if HAVE_LIBVALA_0_15_0
VALA_FLAGS = -D VALA_0_15_0
endif
-
-AM_CFLAGS = -g \
+AM_CFLAGS = \
-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
-I $(top_builddir)/src/libvaladoc/ \
$(GLIB_CFLAGS) \
@@ -18,24 +14,29 @@ AM_CFLAGS = -g \
$(LIBGVC_CFLAGS) \
$(LIBVALA_0_15_0_CFLAGS) \
$(LIBVALA_0_16_X_CFLAGS) \
+ -g \
+ -w \
$(NULL)
-
+AM_VALAFLAGS = \
+ $(VALAFLAGS) \
+ --vapidir $(VERSIONED_VAPI_DIR) \
+ --vapidir $(top_srcdir)/src/vapi \
+ --vapidir $(top_srcdir)/src/libvaladoc \
+ --basedir $(srcdir) \
+ --directory $(builddir) \
+ -C \
+ -g \
+ $(NULL)
BUILT_SOURCES = libdriver.vala.stamp
+driver_LTLIBRARIES = libdriver.la
driverdir = $(libdir)/valadoc/drivers/0.16.x
-
libdriver_la_LDFLAGS = -module -avoid-version -no-undefined
-
-driver_LTLIBRARIES = \
- libdriver.la \
- $(NULL)
-
-
libdriver_la_VALASOURCES = \
initializerbuilder.vala \
symbolresolver.vala \
@@ -44,18 +45,19 @@ libdriver_la_VALASOURCES = \
driver.vala \
$(NULL)
-
-libdriver_la_SOURCES = \
- libdriver.vala.stamp \
+nodist_libdriver_la_SOURCES = \
$(libdriver_la_VALASOURCES:.vala=.c) \
$(NULL)
-
libdriver.vala.stamp: $(libdriver_la_VALASOURCES) Makefile
- $(VALAC) $(VALA_FLAGS) -C --vapidir $(VERSIONED_VAPI_DIR) --vapidir $(top_srcdir)/src/vapi --vapidir
$(top_srcdir)/src/libvaladoc --pkg libvala-0.16 --pkg gee-0.8 --pkg valadoc-1.0 $(filter %.vala %.c,$^)
+ $(VALAC) \
+ $(AM_VALAFLAGS) \
+ --pkg libvala-0.16 \
+ --pkg gee-0.8 \
+ --pkg valadoc-1.0 \
+ $(filter %.vala %.c,$^)
touch $@
-
libdriver_la_LIBADD = \
$(top_builddir)/src/libvaladoc/libvaladoc.la \
$(GLIB_LIBS) \
@@ -65,12 +67,12 @@ libdriver_la_LIBADD = \
$(LIBGVC_LIBS) \
$(NULL)
-
-EXTRA_DIST = $(libdriver_la_VALASOURCES) libdriver.vala.stamp
-
-
-MAINTAINERCLEANFILES = \
- $(libdriver_la_VALASOURCES:.vala=.c) \
+EXTRA_DIST = \
+ $(libdriver_la_VALASOURCES) \
$(NULL)
+CLEANFILES = \
+ $(BUILT_SOURCES) \
+ $(nodist_libdriver_la_SOURCES) \
+ $(NULL)
diff --git a/src/driver/0.18.x/Makefile.am b/src/driver/0.18.x/Makefile.am
index 7060123..e1f0637 100644
--- a/src/driver/0.18.x/Makefile.am
+++ b/src/driver/0.18.x/Makefile.am
@@ -1,10 +1,7 @@
NULL =
-
-
VERSIONED_VAPI_DIR=`pkg-config libvala-0.18 --variable vapidir`
-
if HAVE_LIBVALA_0_17_0
VALA_FLAGS = -D VALA_0_17_0
endif
@@ -13,8 +10,7 @@ if HAVE_LIBVALA_0_17__1_3
VALA_FLAGS = -D VALA_0_17__1_3
endif
-
-AM_CFLAGS = -g \
+AM_CFLAGS = \
-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
-I $(top_builddir)/src/libvaladoc/ \
$(GLIB_CFLAGS) \
@@ -24,24 +20,29 @@ AM_CFLAGS = -g \
$(LIBVALA_0_17__1_3_CFLAGS) \
$(LIBVALA_0_17_1_CFLAGS) \
$(LIBVALA_0_17_0_CFLAGS) \
+ -g \
+ -w \
$(NULL)
-
+AM_VALAFLAGS = \
+ $(VALAFLAGS) \
+ --vapidir $(VERSIONED_VAPI_DIR) \
+ --vapidir $(top_srcdir)/src/vapi \
+ --vapidir $(top_srcdir)/src/libvaladoc \
+ --basedir $(srcdir) \
+ --directory $(builddir) \
+ -C \
+ -g \
+ $(NULL)
BUILT_SOURCES = libdriver.vala.stamp
+driver_LTLIBRARIES = libdriver.la
driverdir = $(libdir)/valadoc/drivers/0.18.x
-
libdriver_la_LDFLAGS = -module -avoid-version -no-undefined
-
-driver_LTLIBRARIES = \
- libdriver.la \
- $(NULL)
-
-
libdriver_la_VALASOURCES = \
initializerbuilder.vala \
symbolresolver.vala \
@@ -50,18 +51,19 @@ libdriver_la_VALASOURCES = \
driver.vala \
$(NULL)
-
-libdriver_la_SOURCES = \
- libdriver.vala.stamp \
+nodist_libdriver_la_SOURCES = \
$(libdriver_la_VALASOURCES:.vala=.c) \
$(NULL)
-
libdriver.vala.stamp: $(libdriver_la_VALASOURCES) Makefile
- $(VALAC) $(VALA_FLAGS) -C --vapidir $(VERSIONED_VAPI_DIR) --vapidir $(top_srcdir)/src/vapi --vapidir
$(top_srcdir)/src/libvaladoc --pkg libvala-0.18 --pkg gee-0.8 --pkg valadoc-1.0 $(filter %.vala %.c,$^)
+ $(VALAC) \
+ $(AM_VALAFLAGS) \
+ --pkg libvala-0.18 \
+ --pkg gee-0.8 \
+ --pkg valadoc-1.0 \
+ $(filter %.vala %.c,$^)
touch $@
-
libdriver_la_LIBADD = \
$(top_builddir)/src/libvaladoc/libvaladoc.la \
$(GLIB_LIBS) \
@@ -73,12 +75,12 @@ libdriver_la_LIBADD = \
$(LIBGVC_LIBS) \
$(NULL)
-
-EXTRA_DIST = $(libdriver_la_VALASOURCES) libdriver.vala.stamp
-
-
-MAINTAINERCLEANFILES = \
- $(libdriver_la_VALASOURCES:.vala=.c) \
+EXTRA_DIST = \
+ $(libdriver_la_VALASOURCES) \
$(NULL)
+CLEANFILES = \
+ $(BUILT_SOURCES) \
+ $(nodist_libdriver_la_SOURCES) \
+ $(NULL)
diff --git a/src/driver/0.20.x/Makefile.am b/src/driver/0.20.x/Makefile.am
index 383cc29..08a7131 100644
--- a/src/driver/0.20.x/Makefile.am
+++ b/src/driver/0.20.x/Makefile.am
@@ -1,33 +1,37 @@
NULL =
-
VERSIONED_VAPI_DIR=`pkg-config libvala-0.20 --variable vapidir`
-
-AM_CFLAGS = -g \
+AM_CFLAGS = \
-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
-I $(top_builddir)/src/libvaladoc/ \
$(GLIB_CFLAGS) \
$(LIBGEE_CFLAGS) \
$(LIBGVC_CFLAGS) \
$(LIBVALA_0_20_X_CFLAGS) \
+ -g \
+ -w \
$(NULL)
+AM_VALAFLAGS = \
+ $(VALAFLAGS) \
+ --vapidir $(VERSIONED_VAPI_DIR) \
+ --vapidir $(top_srcdir)/src/vapi \
+ --vapidir $(top_srcdir)/src/libvaladoc \
+ --basedir $(srcdir) \
+ --directory $(builddir) \
+ -C \
+ -g \
+ $(NULL)
BUILT_SOURCES = libdriver.vala.stamp
+driver_LTLIBRARIES = libdriver.la
driverdir = $(libdir)/valadoc/drivers/0.20.x
-
libdriver_la_LDFLAGS = -module -avoid-version -no-undefined
-
-driver_LTLIBRARIES = \
- libdriver.la \
- $(NULL)
-
-
libdriver_la_VALASOURCES = \
initializerbuilder.vala \
symbolresolver.vala \
@@ -36,18 +40,19 @@ libdriver_la_VALASOURCES = \
driver.vala \
$(NULL)
-
-libdriver_la_SOURCES = \
- libdriver.vala.stamp \
+nodist_libdriver_la_SOURCES = \
$(libdriver_la_VALASOURCES:.vala=.c) \
$(NULL)
-
libdriver.vala.stamp: $(libdriver_la_VALASOURCES) Makefile
- $(VALAC) $(VALA_FLAGS) -C --vapidir $(VERSIONED_VAPI_DIR) --vapidir $(top_srcdir)/src/vapi --vapidir
$(top_srcdir)/src/libvaladoc --pkg libvala-0.20 --pkg gee-0.8 --pkg valadoc-1.0 $(filter %.vala %.c,$^)
+ $(VALAC) \
+ $(AM_VALAFLAGS) \
+ --pkg libvala-0.20 \
+ --pkg gee-0.8 \
+ --pkg valadoc-1.0 \
+ $(filter %.vala %.c,$^)
touch $@
-
libdriver_la_LIBADD = \
$(top_builddir)/src/libvaladoc/libvaladoc.la \
$(GLIB_LIBS) \
@@ -56,12 +61,12 @@ libdriver_la_LIBADD = \
$(LIBGVC_LIBS) \
$(NULL)
-
-EXTRA_DIST = $(libdriver_la_VALASOURCES) libdriver.vala.stamp
-
-
-MAINTAINERCLEANFILES = \
- $(libdriver_la_VALASOURCES:.vala=.c) \
+EXTRA_DIST = \
+ $(libdriver_la_VALASOURCES) \
$(NULL)
+CLEANFILES = \
+ $(BUILT_SOURCES) \
+ $(nodist_libdriver_la_SOURCES) \
+ $(NULL)
diff --git a/src/driver/0.22.x/Makefile.am b/src/driver/0.22.x/Makefile.am
index bc6d060..10cf617 100644
--- a/src/driver/0.22.x/Makefile.am
+++ b/src/driver/0.22.x/Makefile.am
@@ -1,33 +1,37 @@
NULL =
-
VERSIONED_VAPI_DIR=`pkg-config libvala-0.22 --variable vapidir`
-
-AM_CFLAGS = -g \
+AM_CFLAGS = \
-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
-I $(top_builddir)/src/libvaladoc/ \
$(GLIB_CFLAGS) \
$(LIBGEE_CFLAGS) \
$(LIBGVC_CFLAGS) \
$(LIBVALA_0_22_X_CFLAGS) \
+ -g \
+ -w \
$(NULL)
+AM_VALAFLAGS = \
+ $(VALAFLAGS) \
+ --vapidir $(VERSIONED_VAPI_DIR) \
+ --vapidir $(top_srcdir)/src/vapi \
+ --vapidir $(top_srcdir)/src/libvaladoc \
+ --basedir $(srcdir) \
+ --directory $(builddir) \
+ -C \
+ -g \
+ $(NULL)
BUILT_SOURCES = libdriver.vala.stamp
+driver_LTLIBRARIES = libdriver.la
driverdir = $(libdir)/valadoc/drivers/0.22.x
-
libdriver_la_LDFLAGS = -module -avoid-version -no-undefined
-
-driver_LTLIBRARIES = \
- libdriver.la \
- $(NULL)
-
-
libdriver_la_VALASOURCES = \
initializerbuilder.vala \
symbolresolver.vala \
@@ -36,18 +40,19 @@ libdriver_la_VALASOURCES = \
driver.vala \
$(NULL)
-
-libdriver_la_SOURCES = \
- libdriver.vala.stamp \
+nodist_libdriver_la_SOURCES = \
$(libdriver_la_VALASOURCES:.vala=.c) \
$(NULL)
-
libdriver.vala.stamp: $(libdriver_la_VALASOURCES) Makefile
- $(VALAC) $(VALA_FLAGS) -C --vapidir $(VERSIONED_VAPI_DIR) --vapidir $(top_srcdir)/src/vapi --vapidir
$(top_srcdir)/src/libvaladoc --pkg libvala-0.22 --pkg gee-0.8 --pkg valadoc-1.0 $(filter %.vala %.c,$^)
+ $(VALAC) \
+ $(AM_VALAFLAGS) \
+ --pkg libvala-0.22 \
+ --pkg gee-0.8 \
+ --pkg valadoc-1.0 \
+ $(filter %.vala %.c,$^)
touch $@
-
libdriver_la_LIBADD = \
$(top_builddir)/src/libvaladoc/libvaladoc.la \
$(GLIB_LIBS) \
@@ -56,12 +61,12 @@ libdriver_la_LIBADD = \
$(LIBGVC_LIBS) \
$(NULL)
-
-EXTRA_DIST = $(libdriver_la_VALASOURCES) libdriver.vala.stamp
-
-
-MAINTAINERCLEANFILES = \
- $(libdriver_la_VALASOURCES:.vala=.c) \
+EXTRA_DIST = \
+ $(libdriver_la_VALASOURCES) \
$(NULL)
+CLEANFILES = \
+ $(BUILT_SOURCES) \
+ $(nodist_libdriver_la_SOURCES) \
+ $(NULL)
diff --git a/src/driver/0.24.x/Makefile.am b/src/driver/0.24.x/Makefile.am
index beb3264..37a8255 100644
--- a/src/driver/0.24.x/Makefile.am
+++ b/src/driver/0.24.x/Makefile.am
@@ -1,33 +1,37 @@
NULL =
-
VERSIONED_VAPI_DIR=`pkg-config libvala-0.24 --variable vapidir`
-
-AM_CFLAGS = -g \
+AM_CFLAGS = \
-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
-I $(top_builddir)/src/libvaladoc/ \
$(GLIB_CFLAGS) \
$(LIBGEE_CFLAGS) \
$(LIBGVC_CFLAGS) \
$(LIBVALA_0_24_X_CFLAGS) \
+ -g \
+ -w \
$(NULL)
+AM_VALAFLAGS = \
+ $(VALAFLAGS) \
+ --vapidir $(VERSIONED_VAPI_DIR) \
+ --vapidir $(top_srcdir)/src/vapi \
+ --vapidir $(top_srcdir)/src/libvaladoc \
+ --basedir $(srcdir) \
+ --directory $(builddir) \
+ -C \
+ -g \
+ $(NULL)
BUILT_SOURCES = libdriver.vala.stamp
+driver_LTLIBRARIES = libdriver.la
driverdir = $(libdir)/valadoc/drivers/0.24.x
-
libdriver_la_LDFLAGS = -module -avoid-version -no-undefined
-
-driver_LTLIBRARIES = \
- libdriver.la \
- $(NULL)
-
-
libdriver_la_VALASOURCES = \
initializerbuilder.vala \
symbolresolver.vala \
@@ -36,18 +40,19 @@ libdriver_la_VALASOURCES = \
driver.vala \
$(NULL)
-
-libdriver_la_SOURCES = \
- libdriver.vala.stamp \
+nodist_libdriver_la_SOURCES = \
$(libdriver_la_VALASOURCES:.vala=.c) \
$(NULL)
-
libdriver.vala.stamp: $(libdriver_la_VALASOURCES) Makefile
- $(VALAC) $(VALA_FLAGS) -C --vapidir $(VERSIONED_VAPI_DIR) --vapidir $(top_srcdir)/src/vapi --vapidir
$(top_srcdir)/src/libvaladoc --pkg libvala-0.24 --pkg gee-0.8 --pkg valadoc-1.0 $(filter %.vala %.c,$^)
+ $(VALAC) \
+ $(AM_VALAFLAGS) \
+ --pkg libvala-0.24 \
+ --pkg gee-0.8 \
+ --pkg valadoc-1.0 \
+ $(filter %.vala %.c,$^)
touch $@
-
libdriver_la_LIBADD = \
$(top_builddir)/src/libvaladoc/libvaladoc.la \
$(GLIB_LIBS) \
@@ -56,12 +61,12 @@ libdriver_la_LIBADD = \
$(LIBGVC_LIBS) \
$(NULL)
-
-EXTRA_DIST = $(libdriver_la_VALASOURCES) libdriver.vala.stamp
-
-
-MAINTAINERCLEANFILES = \
- $(libdriver_la_VALASOURCES:.vala=.c) \
+EXTRA_DIST = \
+ $(libdriver_la_VALASOURCES) \
$(NULL)
+CLEANFILES = \
+ $(BUILT_SOURCES) \
+ $(nodist_libdriver_la_SOURCES) \
+ $(NULL)
diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am
index 64ac38a..6c01ab7 100644
--- a/src/driver/Makefile.am
+++ b/src/driver/Makefile.am
@@ -1,5 +1,3 @@
-# src/Makefile.am
-
NULL =
if HAVE_LIBVALA_0_13_0
@@ -56,4 +54,3 @@ SUBDIRS = \
$(DRIVER_0_24_X_DIR) \
$(NULL)
-
diff --git a/src/libvaladoc/Makefile.am b/src/libvaladoc/Makefile.am
index 1b93e3a..20acee1 100644
--- a/src/libvaladoc/Makefile.am
+++ b/src/libvaladoc/Makefile.am
@@ -2,26 +2,34 @@ NULL =
DEFAULT_DRIVER = "`$(VALAC) --api-version >& /dev/null; if [ $$? = 0 ]; then $(VALAC) --api-version; else
$(VALAC) --version; fi`"
-
AM_CFLAGS = \
-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
- -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
- -DPACKAGE_VERSION=\"$(VERSION)\" \
- -DDEFAULT_DRIVER=\"$(DEFAULT_DRIVER)\" \
- $(LIBGVC_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(LIBGEE_CFLAGS) \
- $(GMODULE_CFLAGS) \
+ -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
+ -DPACKAGE_VERSION=\"$(VERSION)\" \
+ -DDEFAULT_DRIVER=\"$(DEFAULT_DRIVER)\" \
+ $(LIBGVC_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(LIBGEE_CFLAGS) \
+ $(GMODULE_CFLAGS) \
+ -g \
+ -w \
$(NULL)
+AM_VALAFLAGS = \
+ $(VALAFLAGS) \
+ --vapidir $(top_srcdir)/src/vapi/ \
+ --basedir $(srcdir) \
+ --directory $(builddir) \
+ -C \
+ -g \
+ $(NULL)
-BUILT_SOURCES = libvaladoc.vala.stamp
-
-
-lib_LTLIBRARIES = \
- libvaladoc.la \
+BUILT_SOURCES = \
+ libvaladoc.vala.stamp \
+ valadoc-1.0.h \
$(NULL)
+lib_LTLIBRARIES = libvaladoc.la
libvaladoc_la_VALASOURCES = \
doclet.vala \
@@ -157,60 +165,59 @@ libvaladoc_la_VALASOURCES = \
html/htmlrenderer.vala \
$(NULL)
-
-libvaladoc_la_SOURCES = \
- libvaladoc.vala.stamp \
+nodist_libvaladoc_la_SOURCES = \
$(libvaladoc_la_VALASOURCES:.vala=.c) \
$(NULL)
-
-libvaladocinclude_HEADERS = \
- valadoc-1.0.h \
- $(NULL)
-
-
-libvaladocincludedir = $(includedir)/
-
-
+valadoc-1.0.vapi valadoc-1.0.h: libvaladoc.vala.stamp
libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) Makefile
- $(VALAC) $(VALAFLAGS) -C -H valadoc-1.0.h --pkg gee-0.8 --pkg libgvc --pkg gmodule-2.0 --vapidir
$(top_srcdir)/src/vapi --pkg config --library valadoc-1.0 $(filter %.vala %.c,$^)
+ $(VALAC) \
+ $(AM_VALAFLAGS) \
+ -H valadoc-1.0.h \
+ --library valadoc-1.0 \
+ --vapi valadoc-1.0.vapi \
+ --pkg config \
+ --pkg gee-0.8 \
+ --pkg gmodule-2.0 \
+ --pkg libgvc \
+ $(filter %.vala %.c,$^)
touch $@
-
libvaladoc_la_LDFLAGS = -no-undefined
-
libvaladoc_la_LIBADD = \
- $(LIBGVC_LIBS) \
- $(LIBGEE_LIBS) \
- $(GLIB_LIBS) \
- $(GMODULE_LIBS) \
+ $(LIBGVC_LIBS) \
+ $(LIBGEE_LIBS) \
+ $(GLIB_LIBS) \
+ $(GMODULE_LIBS) \
$(NULL)
-
-EXTRA_DIST = \
- $(libvaladoc_la_VALASOURCES) \
- libvaladoc.vala.stamp \
- valadoc-1.0.vapi \
- valadoc-1.0.deps \
- $(NULL)
-
-
-MAINTAINERCLEANFILES = \
- valadoc-1.0.vapi \
- valadoc-1.0.h \
- valadoc-1.0.gir \
- $(libvaladoc_la_VALASOURCES:.vala=.c) \
+libvaladocincludedir = $(includedir)/
+nodist_libvaladocinclude_HEADERS = \
+ valadoc-1.0.h \
$(NULL)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = valadoc-1.0.pc
-
+nodist_pkgconfig_DATA = valadoc-1.0.pc
vapidir = $(datadir)/vala/vapi
-vapi_DATA = \
+nodist_vapi_DATA = \
valadoc-1.0.vapi \
valadoc-1.0.deps \
$(NULL)
+EXTRA_DIST = \
+ $(libvaladoc_la_VALASOURCES) \
+ valadoc-1.0.deps.in \
+ valadoc-1.0.pc.in \
+ $(NULL)
+
+CLEANFILES = \
+ $(BUILT_SOURCES) \
+ $(nodist_libvaladoc_la_SOURCES) \
+ valadoc-1.0.deps \
+ valadoc-1.0.pc \
+ valadoc-1.0.vapi \
+ valadoc-1.0.h \
+ $(NULL)
diff --git a/src/valadoc/Makefile.am b/src/valadoc/Makefile.am
index 1a08aeb..6b247d7 100644
--- a/src/valadoc/Makefile.am
+++ b/src/valadoc/Makefile.am
@@ -1,55 +1,66 @@
NULL =
-DEFAULT_DRIVER = "`$(VALAC) --version`"
+DEFAULT_DRIVER = "`$(VALAC) --api-version >& /dev/null; if [ $$? = 0 ]; then $(VALAC) --api-version; else
$(VALAC) --version; fi`"
-
-AM_CFLAGS = \
+AM_CFLAGS = \
-DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
- -DPACKAGE_VERSION=\"$(VERSION)\" \
- -DDEFAULT_DRIVER=\"$(DEFAULT_DRIVER)\" \
- -I $(top_builddir)/src/libvaladoc/ \
- $(GLIB_CFLAGS) \
- $(LIBGEE_CFLAGS) \
- $(GMODULE_CFLAGS) \
- $(LIBGVC_CFLAGS) \
+ -DPACKAGE_VERSION=\"$(VERSION)\" \
+ -DDEFAULT_DRIVER=\"$(DEFAULT_DRIVER)\" \
+ -I $(top_builddir)/src/libvaladoc/ \
+ $(GLIB_CFLAGS) \
+ $(LIBGEE_CFLAGS) \
+ $(GMODULE_CFLAGS) \
+ $(LIBGVC_CFLAGS) \
+ -g \
+ -w \
$(NULL)
-
-bin_PROGRAMS = valadoc
-
+AM_VALAFLAGS = \
+ $(VALAFLAGS) \
+ --vapidir $(top_srcdir)/src/vapi/ \
+ --vapidir $(top_builddir)/src/libvaladoc/ \
+ --basedir $(srcdir) \
+ --directory $(builddir) \
+ -C \
+ -g \
+ $(NULL)
BUILT_SOURCES = valadoc.vala.stamp
+bin_PROGRAMS = valadoc
valadoc_VALASOURCES = \
- valadoc.vala \
+ valadoc.vala \
$(NULL)
-
-valadoc_SOURCES = \
+nodist_valadoc_SOURCES = \
$(valadoc_VALASOURCES:.vala=.c) \
$(NULL)
-
-valadoc_LDADD = \
+valadoc_LDADD = \
$(top_builddir)/src/libvaladoc/libvaladoc.la \
- $(GLIB_LIBS) \
- $(GMODULE_LIBS) \
- $(LIBGVC_LIBS) \
- $(LIBGEE_LIBS) \
+ $(GLIB_LIBS) \
+ $(GMODULE_LIBS) \
+ $(LIBGVC_LIBS) \
+ $(LIBGEE_LIBS) \
$(NULL)
-
valadoc.vala.stamp: $(valadoc_VALASOURCES) Makefile
- $(VALAC) -C --pkg config --pkg gee-0.8 --pkg gmodule-2.0 --vapidir $(top_srcdir)/src/vapi/ --vapidir
$(top_builddir)/src/libvaladoc/ --pkg valadoc-1.0 $(filter %.vala %.c,$^)
+ $(VALAC) \
+ $(AM_VALAFLAGS) \
+ --pkg config \
+ --pkg gee-0.8 \
+ --pkg gmodule-2.0 \
+ --pkg valadoc-1.0 \
+ $(filter %.vala %.c,$^)
touch $@
+EXTRA_DIST = \
+ $(valadoc_VALASOURCES) \
+ $(NULL)
-EXTRA_DIST = $(valadoc_VALASOURCES) valadoc.vala.stamp
-
-
-MAINTAINERCLEANFILES = \
- $(valadoc_VALASOURCES:.vala=.c) \
- $(valadoc_VALASOURCES:.vala=.h) \
+CLEANFILES = \
+ $(BUILT_SOURCES) \
+ $(nodist_valadoc_SOURCES) \
$(NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
