From 01a8371687ebdbd667a9de9be6cdd49e9b00f5a2 Mon Sep 17 00:00:00 2001 From: Enrico Zini Date: Wed, 22 Jul 2009 18:40:07 +0200 Subject: [PATCH] Autotoolised --- .gitignore | 24 +++++++++++++ Makefile.am | 12 +++++++ configure.ac | 41 ++++++++++++++++++++++ {src => old}/zavai | 0 src/Makefile.am | 58 ++++++++++++++++++++++++++++++++ {vala => src}/app.vala | 0 {vala => src}/app_debug.vala | 0 {vala => src}/app_gps.vala | 0 {vala => src}/config.vala | 0 {vala => src}/gps.vala | 0 {vala => src}/gps_fix_off.png | Bin {vala => src}/gps_fix_on.png | Bin {vala => src}/gps_nofix_off.png | Bin {vala => src}/gps_nofix_on.png | Bin {vala => src}/log.vala | 0 {vala => src}/registry.vala | 0 {vala => src}/zavai.vala | 0 vala/Makefile | 19 ----------- 18 files changed, 135 insertions(+), 19 deletions(-) create mode 100644 Makefile.am create mode 100644 configure.ac rename {src => old}/zavai (100%) create mode 100644 src/Makefile.am rename {vala => src}/app.vala (100%) rename {vala => src}/app_debug.vala (100%) rename {vala => src}/app_gps.vala (100%) rename {vala => src}/config.vala (100%) rename {vala => src}/gps.vala (100%) rename {vala => src}/gps_fix_off.png (100%) rename {vala => src}/gps_fix_on.png (100%) rename {vala => src}/gps_nofix_off.png (100%) rename {vala => src}/gps_nofix_on.png (100%) rename {vala => src}/log.vala (100%) rename {vala => src}/registry.vala (100%) rename {vala => src}/zavai.vala (100%) delete mode 100644 vala/Makefile diff --git a/.gitignore b/.gitignore index c9b568f..50b0b11 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,26 @@ *.pyc *.swp +*.o +/src/*.c +Makefile.in +/Makefile +/src/Makefile +/src/*.stamp +/aclocal.m4 +/autom4te.cache/ +/compile +/config.guess +/config.h +/config.h.in +/config.log +/config.status +/config.sub +/configure +/depcomp +/install-sh +/libtool +/ltmain.sh +/m4/ +/missing +/src/zavai +/stamp-h1 diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..e2fcd0f --- /dev/null +++ b/Makefile.am @@ -0,0 +1,12 @@ +ACLOCAL_AMFLAGS=-I m4 + +SUBDIRS = src + +#pkgconfigdir = $(libdir)/pkgconfig +#pkgconfig_DATA = gee-1.0.pc + +#EXTRA_DIST += \ +# MAINTAINERS \ +# gee-1.0.pc.in \ +# $(NULL) + diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..4b44d8b --- /dev/null +++ b/configure.ac @@ -0,0 +1,41 @@ +AC_INIT([zavai], [0.1], [enrico@enricozini.org], [zavai]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS(config.h) +AM_INIT_AUTOMAKE(foreign) + +# Checks for programs. +AC_PROG_CC +AM_PROG_CC_C_O +AC_DISABLE_STATIC +AC_PROG_LIBTOOL + +AC_CONFIG_MACRO_DIR([m4]) + +AC_PATH_PROG(VALAC, valac, valac) +AC_SUBST(VALAC) + +AC_SUBST(CFLAGS) +AC_SUBST(CPPFLAGS) +AC_SUBST(LDFLAGS) + +GLIB_REQUIRED=2.10.0 +PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED) +AC_SUBST(GLIB_CFLAGS) +AC_SUBST(GLIB_LIBS) + +PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.80) +AC_SUBST(DBUS_CFLAGS) +AC_SUBST(DBUS_LIBS) + +PKG_CHECK_MODULES(GEE, gee-1.0 >= 0.1) +AC_SUBST(GEE_CFLAGS) +AC_SUBST(GEE_LIBS) + +PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.16.0) +AC_SUBST(GTK_CFLAGS) +AC_SUBST(GTK_LIBS) + +AC_CONFIG_FILES([Makefile + src/Makefile]) + +AC_OUTPUT diff --git a/src/zavai b/old/zavai similarity index 100% rename from src/zavai rename to old/zavai diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..f3bb2ef --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,58 @@ +VFLAGS=-g --pkg gee-1.0 --pkg dbus-glib-1 --pkg gtk+-2.0 + +#zavai: $(SOURCES) +# valac -o zavai $(VFLAGS) $^ +# +#C: $(SOURCES) +# valac -C $(VFLAGS) $^ +# +##zavai: $(SOURCES:.vala=.vala.o) +## echo $< +## gcc $(LDFLAGS) -o zavai $* +## +##%.vala.o: %.vala +## valac $(VFLAGS) -c $< + +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + $(GLIB_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(GEE_CFLAGS) \ + $(GTK_CFLAGS) + +BUILT_SOURCES = zavai.vala.stamp + +bin_PROGRAMS = zavai + +zavai_VALASOURCES = \ + log.vala \ + config.vala \ + registry.vala \ + gps.vala \ + app.vala \ + app_gps.vala \ + app_debug.vala \ + zavai.vala + +zavai_SOURCES = \ + zavai.vala.stamp \ + $(zavai_VALASOURCES:.vala=.c) \ + $(zavai_VALASOURCES:.vala=.h) + +zavai.vapi zavai.vala.stamp: $(zavai_VALASOURCES) + $(VALAC) -C --basedir $(top_srcdir) $(VFLAGS) $^ + touch $@ + +zavai_LDADD = \ + $(GLIB_LIBS) \ + $(DBUS_LIBS) \ + $(GEE_LIBS) \ + $(GTK_LIBS) + +#vapidir = $(datadir)/vala/vapi + +#dist_vapi_DATA = \ +# gee-1.0.vapi \ +# $(NULL) + +#EXTRA_DIST += $(libgee_la_VALASOURCES) gee-1.0.vapi gee.vala.stamp diff --git a/vala/app.vala b/src/app.vala similarity index 100% rename from vala/app.vala rename to src/app.vala diff --git a/vala/app_debug.vala b/src/app_debug.vala similarity index 100% rename from vala/app_debug.vala rename to src/app_debug.vala diff --git a/vala/app_gps.vala b/src/app_gps.vala similarity index 100% rename from vala/app_gps.vala rename to src/app_gps.vala diff --git a/vala/config.vala b/src/config.vala similarity index 100% rename from vala/config.vala rename to src/config.vala diff --git a/vala/gps.vala b/src/gps.vala similarity index 100% rename from vala/gps.vala rename to src/gps.vala diff --git a/vala/gps_fix_off.png b/src/gps_fix_off.png similarity index 100% rename from vala/gps_fix_off.png rename to src/gps_fix_off.png diff --git a/vala/gps_fix_on.png b/src/gps_fix_on.png similarity index 100% rename from vala/gps_fix_on.png rename to src/gps_fix_on.png diff --git a/vala/gps_nofix_off.png b/src/gps_nofix_off.png similarity index 100% rename from vala/gps_nofix_off.png rename to src/gps_nofix_off.png diff --git a/vala/gps_nofix_on.png b/src/gps_nofix_on.png similarity index 100% rename from vala/gps_nofix_on.png rename to src/gps_nofix_on.png diff --git a/vala/log.vala b/src/log.vala similarity index 100% rename from vala/log.vala rename to src/log.vala diff --git a/vala/registry.vala b/src/registry.vala similarity index 100% rename from vala/registry.vala rename to src/registry.vala diff --git a/vala/zavai.vala b/src/zavai.vala similarity index 100% rename from vala/zavai.vala rename to src/zavai.vala diff --git a/vala/Makefile b/vala/Makefile deleted file mode 100644 index 36119d3..0000000 --- a/vala/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -SOURCES=log.vala config.vala registry.vala gps.vala app.vala app_gps.vala app_debug.vala zavai.vala -VFLAGS=-g --pkg gee-1.0 --pkg dbus-glib-1 --pkg gtk+-2.0 -LDFLAGS=$(shell pkg-config --libs gee-1.0 glib-2.0 gtk+-2.0) - -all: zavai - -zavai: $(SOURCES) - valac -o zavai $(VFLAGS) $^ - -C: $(SOURCES) - valac -C $(VFLAGS) $^ - -#zavai: $(SOURCES:.vala=.vala.o) -# echo $< -# gcc $(LDFLAGS) -o zavai $* -# -#%.vala.o: %.vala -# valac $(VFLAGS) -c $< - -- 2.39.5