[ease/autotools: 7/7] Fix build, need some more work.



commit e6220c62d65dc0ff5e6584f211357ea6b6bc0cab
Author: Stéphane Maniaci <stephane maniaci gmail com>
Date:   Thu May 20 23:43:08 2010 +0200

    Fix build, need some more work.
    
    It builds, but all the resulting *.o files and the executable
    "ease" file are placed in the root directory, and we'd like to keep
    them in src/. Also edit .gitignore.

 .gitignore      |    2 ++
 Makefile.am     |   19 +++++++++++++++++--
 configure.ac    |    4 +++-
 po/POTFILES     |    1 +
 stamp-h1        |    1 +
 5 files changed, 24 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 82e8e69..d17745b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 *DS_Store
 ease
 *.h
+src/*.c
 *.ogv
 RCOS.ease/
 doc
@@ -33,6 +34,7 @@ Makefile
 Makefile.in
 po/Makefile.in.in
 *.cache
+.deps
 intltool-*.in
 *.make
 aclocal.m4
diff --git a/ABOUT-NLS b/ABOUT-NLS
new file mode 100644
index 0000000..e69de29
diff --git a/Makefile.am b/Makefile.am
index efa9ebb..8cc830a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,9 @@
 NULL =
 
+INCLUDES = 
+	-include config.h \
+	$(EASE_CFLAGS)
+
 bin_PROGRAMS = ease
 
 AM_CPPFLAGS = \
@@ -40,10 +44,21 @@ ease_SOURCES = \
 	src/WelcomeWindow.vala \
 	src/ZoomSlider.vala \
 	$(NULL)
-
-ease_VALAFLAGS = $(EASE_PACKAGES)
+# ease_VALAFLAGS = $(EASE_PACKAGES)
+VALAFLAGS = --pkg glib-2.0 \
+		--pkg gtk+-2.0 \
+		--pkg clutter-1.0 \
+		--pkg gdk-2.0 \
+		--pkg libxml-2.0 \
+		--pkg gee-1.0 \
+		--pkg clutter-gtk-0.10 \
+		--pkg cogl-1.0 \
+		--pkg gio-2.0 \
+		--pkg clutter-gst-1.0
+		$(NULL)
 
 SUBDIRS = po
+
 ease_LDADD = \
 	$(EASE_LIBS) \
 	$(NULL)
diff --git a/configure.ac b/configure.ac
index 7659ba1..e933665 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,11 +25,13 @@ dnl LT_PREREQ([2.2.6])
 GNOME_COMPILE_WARNINGS([maximum])
 GNOME_MAINTAINER_MODE_DEFINES
 
-pkg_modules="clutter-gtk-0.10 >= 0.10"
+dnl FIXME
+pkg_modules="clutter-gtk-0.10 >= 0.10 gee-1.0 >= 0.5.0 libxml-2.0 >= 2.7.6 clutter-gst-1.0 >= 1.0.0"
 
 EASE_PACKAGES="--pkg glib-2.0 --pkg gtk+-2.0 --pkg clutter-1.0 --pkg gdk-2.0 --pkg libxml-2.0 --pkg gee-1.0 --pkg clutter-gtk-0.10 --pkg cogl-1.0 --pkg gio-2.0 --pkg clutter-gst-1.0"
 
 PKG_CHECK_MODULES(EASE, [$pkg_modules])
+
 AC_SUBST(EASE_CFLAGS)
 AC_SUBST(EASE_LIBS)
 AC_SUBST(EASE_PACKAGES)
diff --git a/ease_vala.stamp b/ease_vala.stamp
new file mode 100644
index 0000000..e69de29
diff --git a/po/POTFILES b/po/POTFILES
new file mode 100644
index 0000000..2a5305a
--- /dev/null
+++ b/po/POTFILES
@@ -0,0 +1 @@
+	../../src/*.vala
diff --git a/po/stamp-it b/po/stamp-it
new file mode 100644
index 0000000..e69de29
diff --git a/stamp-h1 b/stamp-h1
new file mode 100644
index 0000000..4547fe1
--- /dev/null
+++ b/stamp-h1
@@ -0,0 +1 @@
+timestamp for config.h



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