bux fix for make system

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

diff --git a/src/manager/configure.ac b/src/manager/configure.ac
index 15f3785..917638b 100644 (file)
--- a/src/manager/configure.ac
+++ b/src/manager/configure.ac
@@ -31,5 +31,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/manager/src/Makefile.am b/src/manager/src/Makefile.am
index f5e3e80..c56c548 100644 (file)
--- a/src/manager/src/Makefile.am
+++ b/src/manager/src/Makefile.am
@@ -1,4 +1,8 @@
+SUBDIRS = dbus_wrapper
+
 bin_PROGRAMS = mdictionaryManager
 mdictionaryManager_SOURCES =  untar.c  whitestork.c  ws_manager.c  ws_mng_bookmarks_utils.c  ws_mng_callbacks.c  ws_mng_dictionary_utils.c  ws_mng_gconf_utils.c  ws_mng_searching_threads.c  ws_mng_threads_utils.c
-mdictionaryManager_LDFLAGS = -L$(prefix)/lib $(GLIB_LIBS)  $(GMODULE_LIBS) $(OSSO_LIBS) $(GCONF_LIBS) $(GTHREAD_LIBS) -lbz2 -lws_dbus
-mdictionaryManager_CFLAGS = -DSQLITE=$(SQLITEUSE) $(GLIB_CFLAGS)  $(GMODULE_CFLAGS) $(OSSO_CFLAGS) $(GCONF_CFLAGS) $(GTHREAD_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/../../include 
\ No newline at end of file
+mdictionaryManager_LDFLAGS = $(GLIB_LIBS)  $(GMODULE_LIBS) $(OSSO_LIBS) $(GCONF_LIBS) $(GTHREAD_LIBS) -lbz2
+mdictionaryManager_CFLAGS = -DSQLITE=$(SQLITEUSE) $(GLIB_CFLAGS)  $(GMODULE_CFLAGS) $(OSSO_CFLAGS) $(GCONF_CFLAGS) $(GTHREAD_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/../../include 
+
+mdictionaryManager_LDADD = dbus_wrapper/src/libws_dbus.la
\ No newline at end of file

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