diff options
| author | Joakim Sindholt <opensource@zhasha.com> | 2009-11-09 12:46:14 +0100 |
|---|---|---|
| committer | Joakim Sindholt <opensource@zhasha.com> | 2009-11-09 12:46:14 +0100 |
| commit | 8f7ebb483339322ee2fa4d589c51279617a20910 (patch) | |
| tree | ead3163aa0e128991bda2ba1bee3c5ad70e9512c | |
| parent | 7450587a8d6034a94d7170a4472d7c2ce200d42f (diff) | |
Valaize the the automake/conf scripts
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.am | 50 | ||||
| -rw-r--r-- | configure.ac | 6 |
3 files changed, 23 insertions, 34 deletions
@@ -13,5 +13,6 @@ Makefile Makefile.in rsim stamp-h1 +rsim_vala.stamp *~ .* diff --git a/Makefile.am b/Makefile.am index 105c3f8..9fc63d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,48 +3,40 @@ NULL = AUTOMAKE_OPTIONS = subdir-objects SUBDIRS = \ - data \ - $(NULL) + data \ + $(NULL) INCLUDES = \ - $(RSIM_CFLAGS) \ - -include $(CONFIG_HEADER) \ - $(NULL) + $(RSIM_CFLAGS) \ + -include $(CONFIG_HEADER) \ + $(NULL) bin_PROGRAMS = rsim -BUILT_SOURCES = src/.rsim.vala.stamp - -rsim_VALASOURCES = \ - src/cs.vala \ - src/csimport.vala \ - src/csview.vala \ - src/main.vala \ - src/registers.vala \ - $(NULL) - rsim_SOURCES = \ - $(rsim_VALASOURCES:.vala=.c) \ - $(NULL) + src/cs.vala \ + src/csimport.vala \ + src/csview.vala \ + src/main.vala \ + src/registers.vala \ + $(NULL) -src/.rsim.vala.stamp: $(rsim_VALASOURCES) - $(VALAC) -C --pkg libxml-2.0 --pkg gtk+-2.0 --save-temps --basedir $(top_srcdir) $^ - touch $@ +rsim_VALAFLAGS = \ + --pkg gtk+-2.0 \ + --pkg libxml-2.0 rsim_LDADD = \ - $(RSIM_LIBS) \ - $(NULL) + $(RSIM_LIBS) \ + $(NULL) EXTRA_DIST = \ - $(rsim_VALASOURCES) \ - src/.rsim.vala.stamp \ - $(NULL) + $(rsim_SOURCES:.vala=.c) \ + $(NULL) DISTCLEANFILES = \ - $(NULL) + $(NULL) MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub \ configure depcomp install-sh ltmain.sh \ - Makefile.in missing config.h.in \ - src/.rsim.vala.stamp \ - mkinstalldirs data/Makefile.in + rsim_vala.stamp missing config.h.in \ + mkinstalldirs Makefile.in data/Makefile.in diff --git a/configure.ac b/configure.ac index fb36b47..eb80cb6 100644 --- a/configure.ac +++ b/configure.ac @@ -7,21 +7,17 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_PROG_CC AM_PROG_CC_C_O -AC_PATH_PROG(VALAC, valac, valac) +AM_PROG_VALAC([0.7.5]) AC_SUBST(VALAC) AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) -VALA_REQUIRED=0.7.5 GLIB_REQUIRED=2.12.0 GTK_REQUIRED=2.10.0 LIBXML_REQUIRED=2.0 -PKG_CHECK_MODULES(VALA, - vala-1.0 >= $VALA_REQUIRED) - PKG_CHECK_MODULES(RSIM, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED |