bux fix for build system

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

diff --git a/src/gui/configure.ac b/src/gui/configure.ac
index 2ae565a..e16af73 100644 (file)
--- a/src/gui/configure.ac
+++ b/src/gui/configure.ac
@@ -33,5 +33,7 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AM_PROG_LIBTOOL
 
+AC_CONFIG_SUBDIRS(src/dbus_wrapper)
+
 AC_OUTPUT([  Makefile 
                           src/Makefile])
\ No newline at end of file

diff --git a/src/gui/src/Makefile.am b/src/gui/src/Makefile.am
index 55a5b6a..a15cc43 100644 (file)
--- a/src/gui/src/Makefile.am
+++ b/src/gui/src/Makefile.am
@@ -1,7 +1,9 @@
+SUBDIRS = dbus_wrapper
+
 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$(prefix)/lib $(GTK_LIBS)  $(GTKHTML_LIBS) $(GLIB_LIBS) $(OSSO_LIBS) $(GCONF_LIBS) -lws_dbus
+mdictionary_LDFLAGS = $(GTK_LIBS)  $(GTKHTML_LIBS) $(GLIB_LIBS) $(OSSO_LIBS) $(GCONF_LIBS) 
 
 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`)
@@ -10,4 +12,6 @@ mdictionary_CFLAGS += $(shell pkg-config --exists hildon-fm hildon-libs && echo
 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
+mdictionary_CFLAGS += -DWS_VERSION=\"$(APPVER)\"
+
+mdictionary_LDADD = dbus_wrapper/src/libws_dbus.la
\ No newline at end of file

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