fix errors from rebase
authorgregor herrmann <gregoa@debian.org>
Fri, 8 Jan 2010 01:46:08 +0000 (02:46 +0100)
committergregor herrmann <gregoa@debian.org>
Fri, 8 Jan 2010 01:46:08 +0000 (02:46 +0100)
.gitignore
src/Makefile.am [deleted file]

index 60f00cd99a232f36bcf3cd00288008e8064c9634..378eac25d311703f3f2cd456d8036da525cd0366 100644 (file)
@@ -1,32 +1 @@
-<<<<<<< HEAD
-*.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
-config.h.in~
-src/.deps/
-=======
 build
->>>>>>> .gitignore: build
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644 (file)
index bfa6003..0000000
+++ /dev/null
@@ -1,81 +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
-
-#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) \
-       -DWNCK_I_KNOW_THIS_IS_UNSTABLE \
-       -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE
-
-BUILT_SOURCES = zavai.vala.stamp $(zavai_VALASOURCES:.vala=.c)
-
-bin_PROGRAMS = zavai
-
-bin_SCRIPTS = sat-monitor
-
-zavai_VALASOURCES = \
-       log.vala \
-       config.vala \
-       registry.vala \
-       input.vala \
-       gps.vala \
-       gsm.vala \
-       clock.vala \
-       audio.vala \
-       app.vala \
-       app_keyboard.vala \
-       app_power.vala \
-       app_wm.vala \
-       app_gps.vala \
-       app_gsm.vala \
-       app_calendar.vala \
-       app_polygen.vala \
-       app_main.vala \
-       app_debug.vala \
-       zavai.vala
-
-zavai_VAPIS = linux-input.vapi dbus-extra.vapi devkit-power-gobject.vapi
-
-zavai_SOURCES = \
-       zavai.vala.stamp \
-       $(zavai_VALASOURCES:.vala=.c)
-
-zavai.vapi zavai.vala.stamp: $(zavai_VALASOURCES) $(zavai_VAPIS)
-       $(VALAC) -C --basedir $(top_srcdir) $(VFLAGS) $(zavai_VALASOURCES)
-       touch $@
-
-%.c: %.vala
-
-zavai_LDADD = \
-       $(GLIB_LIBS) \
-       $(DBUS_LIBS) \
-       $(GEE_LIBS) \
-       $(GTK_LIBS) \
-       $(WNCK_LIBS) \
-       $(DEVKITPOWER_LIBS)
-
-#vapidir = $(datadir)/vala/vapi
-
-#dist_vapi_DATA = \
-#      gee-1.0.vapi \
-#      $(NULL)
-
-EXTRA_DIST = $(zavai_VAPIS) sat-monitor update-polygen-info
-#$(libgee_la_VALASOURCES) gee-1.0.vapi gee.vala.stamp