gui has now automake based build system

git-svn-id: file:///svnroot/mdictionary/trunk@265 5bde0345-f819-0410-ac75-e5045f9217cc

diff --git a/src/gui/Makefile b/src/gui/Makefile
new file mode 120000 (symlink)
index 0000000..9578f75
--- /dev/null
+++ b/src/gui/Makefile
@@ -0,0 +1 @@
+makefile_old
\ No newline at end of file

diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
new file mode 100644 (file)
index 0000000..f83dcbb
--- /dev/null
+++ b/src/gui/Makefile.am
@@ -0,0 +1,2 @@
+AUTOMAKE_OPTIONS = foreign
+SUBDIRS = src
\ No newline at end of file

diff --git a/src/gui/autogen.sh b/src/gui/autogen.sh
new file mode 100755 (executable)
index 0000000..b545d89
--- /dev/null
+++ b/src/gui/autogen.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+rm -rf compile config.sub config.guess depcomp install-sh ltmain.sh missing aclocal.m4  autom4te.cache/ Makefile.in configure
+rm config.log config.status libtool Makefile
+
+rm -rf src/.libs src/*.la src/.lo src/.deps src/*.o src/*.lo src/Makefile src/Makefile.in src/mdictionary
+
+#[ "_""$1" != "_nogen" ] && aclocal ; libtoolize ; autoconf ; automake --add-missing ; automake
+
+[ "_""$1" != "_nogen" ] && ( aclocal ; libtoolize ; autoconf ; automake --add-missing ; automake )

diff --git a/src/gui/configure.ac b/src/gui/configure.ac
new file mode 100644 (file)
index 0000000..949d1d1
--- /dev/null
+++ b/src/gui/configure.ac
@@ -0,0 +1,35 @@
+AC_INIT([src/ws_gui.c])
+AM_INIT_AUTOMAKE(mDictionary, 1.0)
+
+# Defines
+APPVER=unofficialbuild
+AC_SUBST(APPVER)
+
+
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.0)
+PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.8 >= 3.8)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.0)
+PKG_CHECK_MODULES(OSSO, libosso >= 1.0)
+PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.0)
+
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_LIBS)
+
+AC_SUBST(GTKHTML_CFLAGS)
+AC_SUBST(GTKHTML_LIBS)
+
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+
+AC_SUBST(OSSO_CFLAGS)
+AC_SUBST(OSSO_LIBS)
+
+AC_SUBST(GCONF_CFLAGS)
+AC_SUBST(GCONF_LIBS)
+
+AC_PROG_CC
+AC_PROG_INSTALL
+AM_PROG_LIBTOOL
+
+AC_OUTPUT([  Makefile 
+                          src/Makefile])
\ No newline at end of file

diff --git a/src/gui/makefile b/src/gui/makefile
deleted file mode 100644 (file)
index 178db92..0000000
--- a/src/gui/makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-CC = gcc
-DEBUG = -g -Wall
-EXECUTABLE = mdictionary
-APP_NAME = mDictionary
-LOCALEDIR = /usr/share/locale
-INCLUDE_GUI = include
-INCLUDE_DBUS_WRAPPER = ../../include
-CFLAGS = `pkg-config --cflags gtk+-2.0 libgtkhtml-3.8 glib-2.0 libosso gconf-2.0` -I${INCLUDE_GUI} -I${INCLUDE_DBUS_WRAPPER}
-LIBS = `pkg-config --libs gtk+-2.0 libgtkhtml-3.8 glib-2.0 libosso gconf-2.0` 
-DEFINES = -DPACKAGE=\"${APP_NAME}\" -DLOCALEDIR=\"${LOCALEDIR}\"
-APP_VER = unofficialbuild
-
-CFLAGS += $(shell pkg-config --exists hildon-fm-2 hildon-1 && echo `pkg-config --cflags hildon-fm-2 hildon-1`)
-LIBS += $(shell pkg-config --exists hildon-fm-2 hildon-1 && echo `pkg-config --libs hildon-fm-2 hildon-1`)
-DEFINES += $(shell pkg-config --exists hildon-fm-2 hildon-1 && echo -DCHINOOK)
-
-CFLAGS += $(shell pkg-config --exists hildon-fm hildon-libs && echo `pkg-config --cflags hildon-fm hildon-libs`)
-LIBS += $(shell pkg-config --exists hildon-fm hildon-libs && echo `pkg-config --libs hildon-fm hildon-libs`)
-
-SOURCES = src
-BINARIES = bin
-MAIN_BINARIES = ../../bin
-
-${EXECUTABLE}: ${BINARIES}/ws_gui.o ${BINARIES}/ws_gui_callbacks.o ${BINARIES}/ws_gui_layout.o ${BINARIES}/ws_gui_utils.o ${MAIN_BINARIES}/ws_dbus.o
-               ${CC} ${DEBUG}   -o ${BINARIES}/${EXECUTABLE} ${BINARIES}/ws_gui.o ${BINARIES}/ws_gui_callbacks.o ${BINARIES}/ws_gui_layout.o ${BINARIES}/ws_gui_utils.o ${MAIN_BINARIES}/ws_dbus.o ${LIBS} ${CFLAGS} ${DEFINES}
-               @cp ${BINARIES}/${EXECUTABLE} ${MAIN_BINARIES}
-
-${BINARIES}/ws_gui.o: ${SOURCES}/ws_gui.c ${INCLUDE_GUI}/ws_gui.h ${INCLUDE_GUI}/ws_gui_callbacks.h ${INCLUDE_GUI}/ws_gui_layout.h ${INCLUDE_DBUS_WRAPPER}/ws_dbus.h
-               ${CC} ${DEBUG} -c ${SOURCES}/ws_gui.c -o ${BINARIES}/ws_gui.o ${CFLAGS}  ${DEFINES}
-
-${BINARIES}/ws_gui_callbacks.o: ${SOURCES}/ws_gui_callbacks.c ${INCLUDE_GUI}/ws_gui_callbacks.h ${INCLUDE_GUI}/ws_gui.h  ${INCLUDE_GUI}/ws_gui_utils.h ${INCLUDE_DBUS_WRAPPER}/ws_dbus.h
-               ${CC} ${DEBUG} -c ${SOURCES}/ws_gui_callbacks.c -o ${BINARIES}/ws_gui_callbacks.o ${CFLAGS}  ${DEFINES}
-
-${BINARIES}/ws_gui_layout.o: ${SOURCES}/ws_gui_layout.c ${INCLUDE_GUI}/ws_gui_layout.h ${INCLUDE_GUI}/ws_gui.h ${INCLUDE_DBUS_WRAPPER}/ws_dbus.h
-               ${CC} ${DEBUG} -DWS_VERSION=\"${APP_VER}\" -c ${SOURCES}/ws_gui_layout.c -o ${BINARIES}/ws_gui_layout.o ${CFLAGS}  ${DEFINES}
-
-${BINARIES}/ws_gui_utils.o: ${SOURCES}/ws_gui_utils.c ${INCLUDE_GUI}/ws_gui_utils.h
-               ${CC} ${DEBUG} -DWS_VERSION=\"${APP_VER}\" -c ${SOURCES}/ws_gui_utils.c -o ${BINARIES}/ws_gui_utils.o ${CFLAGS}  ${DEFINES}
-
-${MAIN_BINARIES}/ws_dbus.o:
-               cd ../dbus_wrapper && make
-
-
-dyn:
-               ${BINARIES}/wsl_gui.o ${BINARIES}/wsl_gui_callbacks.o ${BINARIES}/wsl_gui_layout.o ${BINARIES}/wsl_gui_utils.o
-               @{CC} ${DEBUG} -shared -fPIC -o ${EXECUTABLE}.so ${BINARIES}/wsl_gui.o ${BINARIES}/wsl_gui_callbacks.o ${BINARIES}/wsl_gui_layout.o ${BINARIES}/wsl_gui_utils.o dbus/ws_dbus.o ${LIBS} ${CFLAGS} ${DEFINES}
-
-${BINARIES}/wsl_gui.o: ${SOURCES}/ws_gui.c ${INCLUDE_GUI}/ws_gui.h ${INCLUDE_GUI}/ws_gui_callbacks.h ${INCLUDE_GUI}/ws_gui_layout.h ${INCLUDE_DBUS_WRAPPER}/ws_dbus.h
-               @{CC} ${DEBUG} -fPIC -c ${SOURCES}/ws_gui.c -o ${BINARIES}/wsl_gui.o ${CFLAGS} ${DEFINES}
-
-${BINARIES}/wsl_gui_callbacks.o: ${SOURCES}/ws_gui_callbacks.c ${INCLUDE_GUI}/ws_gui_callbacks.h ${INCLUDE_GUI}/ws_gui.h ${INCLUDE_DBUS_WRAPPER}/ws_dbus.h
-               @{CC} ${DEBUG} -fPIC -c ${SOURCES}/ws_gui_callbacks.c -o ${BINARIES}/wsl_gui_callbacks.o ${CFLAGS} ${DEFINES}
-
-${BINARIES}/wsl_gui_layout.o: ${SOURCES}/ws_gui_layout.c ${INCLUDE_GUI}/ws_gui_layout.h ${INCLUDE_GUI}/ws_gui.h ${INCLUDE_DBUS_WRAPPER}/ws_dbus.h
-               @{CC} ${DEBUG} -fPIC -c ${SOURCES}/ws_gui_layout.c -o ${BINARIES}/wsl_gui_layout.o ${CFLAGS} ${DEFINES}
-
-${BINARIES}/wsl_gui_utils.o: ${SOURCES}/ws_gui_utils.c ${INCLUDE_GUI}/ws_gui_utils.h
-               @{CC} ${DEBUG} -fPIC -c ${SOURCES}/ws_gui_utils.c -o ${BINARIES}/wsl_gui_utils.o ${CFLAGS} ${DEFINES}
-
-clean:
-       rm -f ${BINARIES}/*
-       @echo "done"

diff --git a/src/gui/makefile_old b/src/gui/makefile_old
new file mode 100644 (file)
index 0000000..178db92
--- /dev/null
+++ b/src/gui/makefile_old
@@ -0,0 +1,62 @@
+CC = gcc
+DEBUG = -g -Wall
+EXECUTABLE = mdictionary
+APP_NAME = mDictionary
+LOCALEDIR = /usr/share/locale
+INCLUDE_GUI = include
+INCLUDE_DBUS_WRAPPER = ../../include
+CFLAGS = `pkg-config --cflags gtk+-2.0 libgtkhtml-3.8 glib-2.0 libosso gconf-2.0` -I${INCLUDE_GUI} -I${INCLUDE_DBUS_WRAPPER}
+LIBS = `pkg-config --libs gtk+-2.0 libgtkhtml-3.8 glib-2.0 libosso gconf-2.0` 
+DEFINES = -DPACKAGE=\"${APP_NAME}\" -DLOCALEDIR=\"${LOCALEDIR}\"
+APP_VER = unofficialbuild
+
+CFLAGS += $(shell pkg-config --exists hildon-fm-2 hildon-1 && echo `pkg-config --cflags hildon-fm-2 hildon-1`)
+LIBS += $(shell pkg-config --exists hildon-fm-2 hildon-1 && echo `pkg-config --libs hildon-fm-2 hildon-1`)
+DEFINES += $(shell pkg-config --exists hildon-fm-2 hildon-1 && echo -DCHINOOK)
+
+CFLAGS += $(shell pkg-config --exists hildon-fm hildon-libs && echo `pkg-config --cflags hildon-fm hildon-libs`)
+LIBS += $(shell pkg-config --exists hildon-fm hildon-libs && echo `pkg-config --libs hildon-fm hildon-libs`)
+
+SOURCES = src
+BINARIES = bin
+MAIN_BINARIES = ../../bin
+
+${EXECUTABLE}: ${BINARIES}/ws_gui.o ${BINARIES}/ws_gui_callbacks.o ${BINARIES}/ws_gui_layout.o ${BINARIES}/ws_gui_utils.o ${MAIN_BINARIES}/ws_dbus.o
+               ${CC} ${DEBUG}   -o ${BINARIES}/${EXECUTABLE} ${BINARIES}/ws_gui.o ${BINARIES}/ws_gui_callbacks.o ${BINARIES}/ws_gui_layout.o ${BINARIES}/ws_gui_utils.o ${MAIN_BINARIES}/ws_dbus.o ${LIBS} ${CFLAGS} ${DEFINES}
+               @cp ${BINARIES}/${EXECUTABLE} ${MAIN_BINARIES}
+
+${BINARIES}/ws_gui.o: ${SOURCES}/ws_gui.c ${INCLUDE_GUI}/ws_gui.h ${INCLUDE_GUI}/ws_gui_callbacks.h ${INCLUDE_GUI}/ws_gui_layout.h ${INCLUDE_DBUS_WRAPPER}/ws_dbus.h
+               ${CC} ${DEBUG} -c ${SOURCES}/ws_gui.c -o ${BINARIES}/ws_gui.o ${CFLAGS}  ${DEFINES}
+
+${BINARIES}/ws_gui_callbacks.o: ${SOURCES}/ws_gui_callbacks.c ${INCLUDE_GUI}/ws_gui_callbacks.h ${INCLUDE_GUI}/ws_gui.h  ${INCLUDE_GUI}/ws_gui_utils.h ${INCLUDE_DBUS_WRAPPER}/ws_dbus.h
+               ${CC} ${DEBUG} -c ${SOURCES}/ws_gui_callbacks.c -o ${BINARIES}/ws_gui_callbacks.o ${CFLAGS}  ${DEFINES}
+
+${BINARIES}/ws_gui_layout.o: ${SOURCES}/ws_gui_layout.c ${INCLUDE_GUI}/ws_gui_layout.h ${INCLUDE_GUI}/ws_gui.h ${INCLUDE_DBUS_WRAPPER}/ws_dbus.h
+               ${CC} ${DEBUG} -DWS_VERSION=\"${APP_VER}\" -c ${SOURCES}/ws_gui_layout.c -o ${BINARIES}/ws_gui_layout.o ${CFLAGS}  ${DEFINES}
+
+${BINARIES}/ws_gui_utils.o: ${SOURCES}/ws_gui_utils.c ${INCLUDE_GUI}/ws_gui_utils.h
+               ${CC} ${DEBUG} -DWS_VERSION=\"${APP_VER}\" -c ${SOURCES}/ws_gui_utils.c -o ${BINARIES}/ws_gui_utils.o ${CFLAGS}  ${DEFINES}
+
+${MAIN_BINARIES}/ws_dbus.o:
+               cd ../dbus_wrapper && make
+
+
+dyn:
+               ${BINARIES}/wsl_gui.o ${BINARIES}/wsl_gui_callbacks.o ${BINARIES}/wsl_gui_layout.o ${BINARIES}/wsl_gui_utils.o
+               @{CC} ${DEBUG} -shared -fPIC -o ${EXECUTABLE}.so ${BINARIES}/wsl_gui.o ${BINARIES}/wsl_gui_callbacks.o ${BINARIES}/wsl_gui_layout.o ${BINARIES}/wsl_gui_utils.o dbus/ws_dbus.o ${LIBS} ${CFLAGS} ${DEFINES}
+
+${BINARIES}/wsl_gui.o: ${SOURCES}/ws_gui.c ${INCLUDE_GUI}/ws_gui.h ${INCLUDE_GUI}/ws_gui_callbacks.h ${INCLUDE_GUI}/ws_gui_layout.h ${INCLUDE_DBUS_WRAPPER}/ws_dbus.h
+               @{CC} ${DEBUG} -fPIC -c ${SOURCES}/ws_gui.c -o ${BINARIES}/wsl_gui.o ${CFLAGS} ${DEFINES}
+
+${BINARIES}/wsl_gui_callbacks.o: ${SOURCES}/ws_gui_callbacks.c ${INCLUDE_GUI}/ws_gui_callbacks.h ${INCLUDE_GUI}/ws_gui.h ${INCLUDE_DBUS_WRAPPER}/ws_dbus.h
+               @{CC} ${DEBUG} -fPIC -c ${SOURCES}/ws_gui_callbacks.c -o ${BINARIES}/wsl_gui_callbacks.o ${CFLAGS} ${DEFINES}
+
+${BINARIES}/wsl_gui_layout.o: ${SOURCES}/ws_gui_layout.c ${INCLUDE_GUI}/ws_gui_layout.h ${INCLUDE_GUI}/ws_gui.h ${INCLUDE_DBUS_WRAPPER}/ws_dbus.h
+               @{CC} ${DEBUG} -fPIC -c ${SOURCES}/ws_gui_layout.c -o ${BINARIES}/wsl_gui_layout.o ${CFLAGS} ${DEFINES}
+
+${BINARIES}/wsl_gui_utils.o: ${SOURCES}/ws_gui_utils.c ${INCLUDE_GUI}/ws_gui_utils.h
+               @{CC} ${DEBUG} -fPIC -c ${SOURCES}/ws_gui_utils.c -o ${BINARIES}/wsl_gui_utils.o ${CFLAGS} ${DEFINES}
+
+clean:
+       rm -f ${BINARIES}/*
+       @echo "done"

diff --git a/src/gui/src/Makefile.am b/src/gui/src/Makefile.am
new file mode 100644 (file)
index 0000000..43ef78d
--- /dev/null
+++ b/src/gui/src/Makefile.am
@@ -0,0 +1,13 @@
+bin_PROGRAMS = mdictionary
+mdictionary_SOURCES = ws_gui.c  ws_gui_callbacks.c  ws_gui_layout.c  ws_gui_utils.c
+mdictionary_CFLAGS = -DLOCALEDIR=\"/usr/share/locale\"  $(GTK_CFLAGS)  $(GTKHTML_CFLAGS) $(GLIB_CFLAGS) $(OSSO_CFLAGS) $(GCONF_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/../../include
+mdictionary_LDFLAGS = -L$(top_srcdir)/../../bin/lib $(GTK_LIBS)  $(GTKHTML_LIBS) $(GLIB_LIBS) $(OSSO_LIBS) $(GCONF_LIBS) -lws_dbus
+
+mdictionary_CFLAGS += $(shell pkg-config --exists hildon-fm-2 hildon-1 && echo `pkg-config --cflags hildon-fm-2 hildon-1`)
+mdictionary_LDFLAGS += $(shell pkg-config --exists hildon-fm-2 hildon-1 && echo `pkg-config --libs hildon-fm-2 hildon-1`)
+
+mdictionary_CFLAGS += $(shell pkg-config --exists hildon-fm hildon-libs && echo `pkg-config --cflags hildon-fm hildon-libs`)
+mdictionary_LDFLAGS += $(shell pkg-config --exists hildon-fm hildon-libs && echo `pkg-config --libs hildon-fm hildon-libs`)
+
+mdictionary_CFLAGS += $(shell pkg-config --exists hildon-fm-2 hildon-1 && echo -DCHINOOK)
+mdictionary_CFLAGS += -DWS_VERSION=\"$(APPVER)\"
\ No newline at end of file