diff options
| author | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-04-26 19:50:13 +0200 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-04-26 19:50:13 +0200 |
| commit | 2bee14d692eba958b18d5a5edb442e0350749a79 (patch) | |
| tree | cb1d70828134bdec58ba7b917b5a7727d723aa10 | |
| parent | 4535efb1caed0a1a3c35319fcc187d25a08f2fff (diff) | |
| download | cornucopia-2bee14d692eba958b18d5a5edb442e0350749a79.tar.gz cornucopia-2bee14d692eba958b18d5a5edb442e0350749a79.tar.bz2 cornucopia-2bee14d692eba958b18d5a5edb442e0350749a79.zip | |
fsoframework: catch up with vala 0.7.x
| -rw-r--r-- | libfsoframework/Makefile.am | 2 | ||||
| -rw-r--r-- | libfsoframework/configure.ac | 2 | ||||
| -rw-r--r-- | libfsoframework/fsoframework/Makefile.am | 9 | ||||
| -rw-r--r-- | libfsoframework/fsoframework/fsoframework-2.0.deps | 6 |
4 files changed, 12 insertions, 7 deletions
diff --git a/libfsoframework/Makefile.am b/libfsoframework/Makefile.am index f4945b66..fd615ba0 100644 --- a/libfsoframework/Makefile.am +++ b/libfsoframework/Makefile.am @@ -20,5 +20,5 @@ MAINTAINERCLEANFILES = \ aclocal.m4 compile config.guess config.sub \ configure depcomp install-sh ltmain.sh \ Makefile.in missing config.h.in \ - mkinstalldirs \ + mkinstalldirs *~ \ $(NULL) diff --git a/libfsoframework/configure.ac b/libfsoframework/configure.ac index ded7f6ab..be964b50 100644 --- a/libfsoframework/configure.ac +++ b/libfsoframework/configure.ac @@ -17,7 +17,7 @@ AC_SUBST(LDFLAGS) # PKG_PROG_PKG_CONFIG -VALA_REQUIRED=0.5.8 +VALA_REQUIRED=0.7.1 DBUS_REQUIRED=1.2.1 DBUS_GLIB_REQUIRED=0.76 GLIB_REQUIRED=2.18.0 diff --git a/libfsoframework/fsoframework/Makefile.am b/libfsoframework/fsoframework/Makefile.am index 9c286601..15ea2957 100644 --- a/libfsoframework/fsoframework/Makefile.am +++ b/libfsoframework/fsoframework/Makefile.am @@ -28,14 +28,10 @@ libfsoframework_la_VALASOURCES = \ libfsoframework_la_SOURCES = \ fsoframework.vala.stamp \ $(libfsoframework_la_VALASOURCES:.vala=.c) \ - $(libfsoframework_la_VALASOURCES:.vala=.h) \ $(NULL) fsoframeworkincludedir = $(includedir)/fsoframework-2.0/fsoframework - -fsoframeworkinclude_HEADERS = \ - $(libfsoframework_la_VALASOURCES:.vala=.h) \ - $(NULL) +fsoframeworkinclude_HEADERS = fsoframework.h fsoframework-1.0.vapi fsoframework.vala.stamp: $(libfsoframework_la_VALASOURCES) $(VALAC) -C --basedir $(top_srcdir) \ @@ -46,6 +42,7 @@ fsoframework-1.0.vapi fsoframework.vala.stamp: $(libfsoframework_la_VALASOURCES) --pkg gmodule-2.0 \ --pkg gio-2.0 \ --pkg dbus-glib-1 \ + --header fsoframework.h --library fsoframework-2.0 $^ touch $@ @@ -58,11 +55,13 @@ vapidir = $(datadir)/vala/vapi dist_vapi_DATA = \ fsoframework-2.0.vapi \ + fsoframework-2.0.deps \ $(NULL) EXTRA_DIST += \ $(libfsoframework_la_VALASOURCES) \ fsoframework-2.0.vapi \ + fsoframework-2.0.deps \ fsoframework.vala.stamp CLEANFILES = \ diff --git a/libfsoframework/fsoframework/fsoframework-2.0.deps b/libfsoframework/fsoframework/fsoframework-2.0.deps new file mode 100644 index 00000000..4fac8899 --- /dev/null +++ b/libfsoframework/fsoframework/fsoframework-2.0.deps @@ -0,0 +1,6 @@ +posix +glib-2.0 +gio-2.0 +gmodule-2.0 +dbus-glib-1 + |