From c4b1dc113773516326a0324322adcd4bbdf94e83 Mon Sep 17 00:00:00 2001 From: Enrico Zini Date: Mon, 14 Dec 2009 11:47:42 +0000 Subject: [PATCH] Removed autotools --- .gitignore | 26 ----------- Makefile.am | 15 ------- README | 4 +- configure.ac | 53 ----------------------- m4/.gitignore | 0 src/CMakeLists.txt | 1 + src/Makefile.am | 106 --------------------------------------------- vala.cmake | 4 +- 8 files changed, 5 insertions(+), 204 deletions(-) delete mode 100644 .gitignore delete mode 100644 Makefile.am delete mode 100644 configure.ac delete mode 100644 m4/.gitignore delete mode 100644 src/Makefile.am diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 50b0b11..0000000 --- a/.gitignore +++ /dev/null @@ -1,26 +0,0 @@ -*.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 deleted file mode 100644 index 89556dd..0000000 --- a/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -ACLOCAL_AMFLAGS=-I m4 - -SUBDIRS = src - -#pkgconfigdir = $(libdir)/pkgconfig -#pkgconfig_DATA = gee-1.0.pc - -#EXTRA_DIST += \ -# MAINTAINERS \ -# gee-1.0.pc.in \ -# $(NULL) - -# Send the C files only (with proper timestamp) to the openmoko for compiling -ciapino: - rsync -a src/*.c ciapino:zavai/src/ diff --git a/README b/README index 2cfdda6..d71d456 100644 --- a/README +++ b/README @@ -160,10 +160,10 @@ TODO list / wish list + draw something outside of focus area + ensure that the first and last items are selectable + rename in FisheyeListView - - Split polygen applet in a separate app, ran via a .desktop file + + Split polygen applet in a separate app, ran via a .desktop file (faster zavai startup time, can then integrate a browser in the polygen applet, makes more sense altogether) - - polygen applet with FisheyeListView + + polygen applet with FisheyeListView - lua config - contacts: show as a fancy focus+context list (see prefuse) - vcard on e-vcard.{h,c} diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 78429f4..0000000 --- a/configure.ac +++ /dev/null @@ -1,53 +0,0 @@ -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) - -PKG_CHECK_MODULES(WNCK, libwnck-1.0 >= 2.26.0) -AC_SUBST(WNCK_CFLAGS) -AC_SUBST(WNCK_LIBS) - -PKG_CHECK_MODULES(DEVKITPOWER, devkit-power-gobject >= 010) -AC_SUBST(DEVKITPOWER_CFLAGS) -AC_SUBST(DEVKITPOWER_LIBS) - -PKG_CHECK_MODULES(OMHACKS, libomhacks) -AC_SUBST(OMHACKS_CFLAGS) -AC_SUBST(OMHACKS_LIBS) - -AC_CONFIG_FILES([Makefile - src/Makefile]) - -AC_OUTPUT diff --git a/m4/.gitignore b/m4/.gitignore deleted file mode 100644 index e69de29..0000000 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 441ad8a..d189bec 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -30,3 +30,4 @@ add_executable(zavai-calendar ${zavai-calendar_CSOURCES}) install(TARGETS zavai RUNTIME DESTINATION bin) install(TARGETS zavai-calendar RUNTIME DESTINATION bin) +install(FILES sat-monitor RUNTIME DESTINATION bin) diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index d6fc178..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,106 +0,0 @@ -VFLAGS=-g --pkg gee-1.0 --pkg dbus-glib-1 --pkg gtk+-2.0 --pkg posix --pkg libwnck-1.0 --vapidir=. --pkg linux-input --pkg dbus-extra --pkg devkit-power-gobject --pkg omhacks - -#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) \ - $(WNCK_CFLAGS) \ - $(DEVKITPOWER_CFLAGS) \ - $(OMHACKS_CFLAGS) \ - -DWNCK_I_KNOW_THIS_IS_UNSTABLE \ - -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE - -zavai_VAPIS = linux-input.vapi dbus-extra.vapi devkit-power-gobject.vapi omhacks.vapi - -BUILT_SOURCES = zavai.vala.stamp zavai-calendar.vala.stamp \ - $(zavai_VALASOURCES:.vala=.c) $(zavai_calendar_VALASOURCES:.vala=.c) - -bin_PROGRAMS = zavai zavai-calendar - -bin_SCRIPTS = sat-monitor - -zavai_VALASOURCES = \ - at.vala \ - log.vala \ - core.vala \ - config.vala \ - registry.vala \ - input.vala \ - gps.vala \ - gsm.vala \ - clock.vala \ - audio.vala \ - widgets/calendar.vala \ - app.vala \ - app_keyboard.vala \ - app_power.vala \ - app_wm.vala \ - app_gps.vala \ - app_gsm.vala \ - app_calendar.vala \ - app_main.vala \ - app_debug.vala \ - zavai.vala - -zavai_calendar_VALASOURCES = \ - log.vala \ - core.vala \ - config.vala \ - widgets/calendar.vala \ - zavai-calendar.vala - -zavai_SOURCES = \ - zavai.vala.stamp \ - $(zavai_VALASOURCES:.vala=.c) - -zavai_calendar_SOURCES = \ - zavai-calendar.vala.stamp \ - $(zavai_calendar_VALASOURCES:.vala=.c) - -zavai.vapi zavai.vala.stamp: $(zavai_VALASOURCES) $(zavai_VAPIS) - $(VALAC) -C --basedir $(top_srcdir) $(VFLAGS) $(zavai_VALASOURCES) - touch $@ - -zavai-calendar.vapi zavai-calendar.vala.stamp: $(zavai_calendar_VALASOURCES) $(zavai_VAPIS) - $(VALAC) -C --basedir $(top_srcdir) $(VFLAGS) $(zavai_calendar_VALASOURCES) - touch $@ - -%.c: %.vala - -zavai_LDADD = \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) \ - $(GEE_LIBS) \ - $(GTK_LIBS) \ - $(WNCK_LIBS) \ - $(DEVKITPOWER_LIBS) \ - $(OMHACKS_LIBS) - -zavai_calendar_LDADD = \ - $(GLIB_LIBS) \ - $(GEE_LIBS) \ - $(GTK_LIBS) - -#vapidir = $(datadir)/vala/vapi - -#dist_vapi_DATA = \ -# gee-1.0.vapi \ -# $(NULL) - -EXTRA_DIST = $(zavai_VAPIS) sat-monitor -#$(libgee_la_VALASOURCES) gee-1.0.vapi gee.vala.stamp diff --git a/vala.cmake b/vala.cmake index 51bfa6c..564c77f 100644 --- a/vala.cmake +++ b/vala.cmake @@ -25,8 +25,8 @@ function(add_vala_library libname) set(pkgs ${pkgs} --pkg=${pkg}) endforeach(pkg) - message(DEPENDS ${valasources}) - message(OUTPUT ${csources} ${CMAKE_CURRENT_BINARY_DIR}/${libname}.h ${CMAKE_CURRENT_BINARY_DIR}/${libname}.vapi) + #message(DEPENDS ${valasources}) + #message(OUTPUT ${csources} ${CMAKE_CURRENT_BINARY_DIR}/${libname}.h ${CMAKE_CURRENT_BINARY_DIR}/${libname}.vapi) add_custom_command( DEPENDS ${valasources} OUTPUT ${csources} ${header} ${vapi} -- 2.39.5