autoconf tweaking

diff --git a/autogen.sh b/autogen.sh
new file mode 100755 (executable)
index 0000000..e3d2e0c
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -x
+aclocal-1.7
+autoconf
+autoheader
+libtoolize
+automake-1.7 --add-missing --foreign

diff --git a/configure.ac b/configure.ac
new file mode 100644 (file)
index 0000000..be72da0
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,25 @@
+AC_INIT(Makefile.am)
+AM_INIT_AUTOMAKE(eyes-widget, 1.0.0)
+AM_CONFIG_HEADER([config.h])
+
+AC_PROG_CPP
+AC_PROG_INSTALL
+AC_PROG_LIBTOOL
+
+PKG_CHECK_MODULES(GTK, gtk+-2.0)
+AC_SUBST(GTK_LIBS)
+AC_SUBST(GTK_CFLAGS)
+
+PKG_CHECK_MODULES(HILDON, libhildondesktop-1)
+AC_SUBST(HILDON_LIBS)
+AC_SUBST(HILDON_CFLAGS)
+
+AC_OUTPUT([
+Makefile
+src/Makefile
+icons/Makefile
+icons/48x48/Makefile
+icons/64x64/Makefile
+themes/Makefile
+themes/Default/Makefile
+])

diff --git a/src/Makefile.am b/src/Makefile.am
index e3fd611..47d6630 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,3 @@
-# $Id: Makefile.am 2397 2007-01-17 17:46:35Z nick $
-
 INCLUDES =                                                             \
        -I$(top_srcdir)                                                 \
        -DPACKAGE_LOCALE_DIR=\"$(localedir)\"                           \
@@ -16,25 +14,13 @@ eyes_widget_so_SOURCES =                                            \
        accelerometer.h                                                 \
        accelerometer.c
 
-eyes_widget_so_CFLAGS =                                                \
-       $(HILDON_DEPS_CFLAGS)                                   
+eyes_widget_so_CFLAGS =                                                        \
+       $(HILDON_CFLAGS)                                                \
+       $(GTK_CFLAGS)
 
-eyes_widget_so_LDFLAGS =                                               \
-       $(HILDON_DEPS_LIBS) -shared                                     
+eyes_widget_so_LDFLAGS = -shared                                       \
+       $(HILDON_LIBS)                                          \
+       $(GTK_LIBS)                                     
 
 desktopdir = `pkg-config libhildondesktop-1 --variable=hildonhomedesktopentrydir`
-#desktop_in_in_files = eyes-widget.desktop.in.in
-#desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-#%.desktop.in: %.desktop.in.in
-#      sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
 desktop_DATA = eyes-widget.desktop
-#@INTLTOOL_DESKTOP_RULE@
-
-#EXTRA_DIST =                                                          \
-#      $(desktop_in_in_files)
-
-#CLEANFILES =                                                          \
-#      $(desktop_in_files)                                             \
-#      $(desktop_DATA)
-
-# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: