[ease] Fix "make distcheck".
- From: Nate Stedman <natesm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ease] Fix "make distcheck".
- Date: Sun, 8 Aug 2010 05:45:52 +0000 (UTC)
commit 21ae367a135cacaa3a51c7480898309e54fb6912
Author: Nate Stedman <natesm gmail com>
Date: Sun Aug 8 01:44:46 2010 -0400
Fix "make distcheck".
Thanks to nemequ on #vala for help!
ease-core/Makefile.am | 44 ++++++++++++++--------------
ease-core/ease-change-source.vala | 56 -------------------------------------
ease/Makefile.am | 29 ++++++------------
flutter/Makefile.am | 14 ++++----
po/POTFILES.in | 2 +-
5 files changed, 40 insertions(+), 105 deletions(-)
---
diff --git a/ease-core/Makefile.am b/ease-core/Makefile.am
index 0e18367..af45981 100644
--- a/ease-core/Makefile.am
+++ b/ease-core/Makefile.am
@@ -1,15 +1,5 @@
lib_LTLIBRARIES = libease-core-0.3.la
-INCLUDES = \
- $(EASE_CFLAGS)
-
-EASE_CFLAGS += -w -I../flutter
-
-AM_CPPFLAGS = \
- $(EASE_CFLAGS) \
- -include $(CONFIG_HEADER) \
- $(NULL)
-
# source files
libease_core_0_3_la_SOURCES = \
ease-actor.vala \
@@ -63,34 +53,44 @@ libease_core_0_3_la_SOURCES = \
libease_core_0_3_la_VALAFLAGS = \
$(EASE_PACKAGES) \
- --vapi=../vapi/ease-core-0.3.vapi \
- --header=libease-core.h \
+ --vapi=$(top_srcdir)/vapi/ease-core-0.3.vapi \
+ --header=ease-core.h \
--thread \
--disable-warnings \
- --vapidir=../vapi \
+ --vapidir=$(top_srcdir)/vapi \
--pkg flutter-0.3 \
-g \
$(NULL)
-libease_core_0_3_la_LIBADD = ../flutter/libflutter-0.3.la
-libease_core_0_3_la_CFLAGS = $(EASE_CFLAGS)
-libease_core_0_3_la_LDFLAGS = $(EASE_LDFLAGS) --export-dynamic
+libease_core_0_3_la_LIBADD = $(top_builddir)/flutter/libflutter-0.3.la
+
+libease_core_0_3_la_CFLAGS = \
+ $(EASE_CFLAGS) \
+ -w \
+ -include $(top_srcdir)/config.h \
+ -I$(top_srcdir)/flutter \
+ $(NULL)
+
+libease_core_0_3_la_LDFLAGS = \
+ $(EASE_LDFLAGS) \
+ --export-dynamic \
+ $(NULL)
# header installation
libease_includedir=$(includedir)/ease/
-libease_include_HEADERS = libease-core.h
+libease_include_HEADERS = ease-core.h
# vapi installation
vapidir = $(datadir)/vala/vapi
-vapi_DATA = ../vapi/ease-core-0.3.vapi ../vapi/ease-core-0.3.deps
+vapi_DATA = $(top_srcdir)/vapi/ease-core-0.3.vapi $(top_srcdir)/vapi/ease-core-0.3.deps
# remove generated files on `make clean`
CLEANFILES = \
$(subst .vala,.c,$(libease_core_0_3_la_SOURCES)) \
- ../vapi/ease-core-0.3.vapi \
- libease-core.h
+ $(top_srcdir)/vapi/ease-core-0.3.vapi \
+ ease-core.h
EXTRA_DIST = \
- ../vapi/ease-core-0.3.vapi \
- ../vapi/ease-core-0.3.deps
+ $(top_srcdir)/vapi/ease-core-0.3.vapi \
+ $(top_srcdir)/vapi/ease-core-0.3.deps
diff --git a/ease/Makefile.am b/ease/Makefile.am
index d5ca660..fd40395 100644
--- a/ease/Makefile.am
+++ b/ease/Makefile.am
@@ -29,32 +29,23 @@ ease_VALAFLAGS = \
--pkg flutter-0.3 \
--disable-warnings \
$(EASE_PACKAGES) \
- --vapidir ../vapi \
+ --vapidir $(top_srcdir)/vapi \
--thread \
-g
-ease_CFLAGS = $(EASE_CFLAGS) -w \
- -I../ease-core \
- -I../flutter
+ease_CFLAGS = \
+ $(EASE_CFLAGS) \
+ -w \
+ -I$(top_srcdir)/ease-core \
+ -I$(top_srcdir)/flutter \
+ -include $(top_srcdir)/config.h
-ease_LDFLAGS = --export-dynamic
+ease_LDFLAGS = $(EASE_LIBS) --export-dynamic
ease_LDADD = \
- ../ease-core/libease-core-0.3.la \
- ../flutter/libflutter-0.3.la \
+ $(top_builddir)/ease-core/libease-core-0.3.la \
+ $(top_builddir)/flutter/libflutter-0.3.la \
-lm \
- $(EASE_LIBS) \
- $(NULL)
-
-INCLUDES = \
- -include ../config.h \
- $(EASE_CFLAGS)
-
-AM_CPPFLAGS = \
- $(EASE_CFLAGS) \
- -include $(CONFIG_HEADER) \
- -include ../ease-core/libease-core.h \
- -O0 \
$(NULL)
CLEANFILES = $(subst .vala,.c,$(ease_SOURCES))
diff --git a/flutter/Makefile.am b/flutter/Makefile.am
index c40da7f..52748db 100644
--- a/flutter/Makefile.am
+++ b/flutter/Makefile.am
@@ -16,7 +16,7 @@ libflutter_0_3_la_SOURCES = flutter.vala
# compiler flags
libflutter_0_3_la_VALAFLAGS = \
--pkg clutter-1.0 \
- --vapi=../vapi/flutter-0.3.vapi \
+ --vapi=$(top_srcdir)/vapi/flutter-0.3.vapi \
--header=flutter.h \
--thread \
-g \
@@ -25,24 +25,24 @@ libflutter_0_3_la_VALAFLAGS = \
libflutter_0_3_la_CFLAGS = $(EASE_CFLAGS)
libflutter_0_3_la_LDFLAGS = $(EASE_LDFLAGS)
-# build typelib
-
# header installation
flutter_includedir=$(includedir)/flutter/
flutter_include_HEADERS = flutter.h
# vapi installation
vapidir = $(datadir)/vala/vapi
-vapi_DATA = ../vapi/flutter-0.3.vapi ../vapi/flutter-0.3.deps
+vapi_DATA = \
+ $(top_srcdir)/vapi/flutter-0.3.vapi \
+ $(top_srcdir)/vapi/flutter-0.3.deps
# remove generated files on `make clean`
CLEANFILES = \
flutter.c \
- ../vapi/flutter-0.3.vapi \
+ $(top_srcdir)/vapi/flutter-0.3.vapi \
flutter.h \
libflutter_0_3_la-flutter.lo
EXTRA_DIST = \
- ../vapi/flutter-0.3.vapi \
- ../vapi/flutter-0.3.deps
+ $(top_srcdir)/vapi/flutter-0.3.vapi \
+ $(top_srcdir)/vapi/flutter-0.3.deps
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9c78407..6e14e79 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,7 @@
# List of source files which contain translatable strings.
[encoding: UTF-8]
data/ease.desktop.in
+data/ease.desktop.in.in
ease-core/ease-actor.vala
ease-core/ease-animated-zoom-slider.vala
ease-core/ease-archiver.vala
@@ -8,7 +9,6 @@ ease-core/ease-background.vala
ease-core/ease-background-widget.vala
ease-core/ease-cairo-actor.vala
ease-core/ease-cairo-element.vala
-ease-core/ease-change-source.vala
ease-core/ease-color.vala
ease-core/ease-dialog-progress.vala
ease-core/ease-dialogs.vala
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]