further changes to makesystem

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

diff --git a/src/dbus_wrapper/configure.ac b/src/dbus_wrapper/configure.ac
index 46b11bc..a69cd2b 100644 (file)
--- a/src/dbus_wrapper/configure.ac
+++ b/src/dbus_wrapper/configure.ac
@@ -2,7 +2,7 @@ AC_INIT([src/ws_dbus.c])
 AM_INIT_AUTOMAKE(dbus_wrapper, 1.0)
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.0)
-PKG_CHECK_MODULES(OSSO, libosso >= 0.21)
+PKG_CHECK_MODULES(OSSO, libosso >= 2.0)
 
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)

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

diff --git a/src/plugins/xdxf/Makefile_old b/src/plugins/xdxf/Makefile_old
new file mode 100755 (executable)
index 0000000..60c71ec
--- /dev/null
+++ b/src/plugins/xdxf/Makefile_old
@@ -0,0 +1,43 @@
+COMPILER = gcc
+DEBUG = -Wall -g
+INCLUDE = include
+INCLUDE_ENGINE = ../../../include
+LIBS = `pkg-config --libs glib-2.0 gmodule-2.0 gnome-vfs-2.0` -lexpat
+FLAGS = `pkg-config --cflags glib-2.0 gmodule-2.0 gnome-vfs-2.0` -I${INCLUDE} -I${INCLUDE_ENGINE}
+SOURCES = src
+BINARIES = bin
+MAIN_BINARIES = ../../../bin
+EXECUTABLE = ${SOURCES}/test_engin
+
+${EXECUTABLE}: ${BINARIES}/engine_xdxf.o ${INCLUDE_ENGINE}/dictionary_engine.h                 
+               @echo -e -n   "| Linking engine-xdxf to dynamic library...                                          |\n"
+               @gcc -shared -fPIC ${FLAGS} ${LIBS} ${DEBUG} ${BINARIES}/engine_xdxf.o -o ${SOURCES}/engine_xdxf.so 
+               @echo -e -n   "| Building engine_xdxf module done...                                                |\n"
+               @echo -e -n   "+------------------------------------------------------------------------------------+\n\n"
+               @cp ${SOURCES}/engine_xdxf.so ${MAIN_BINARIES}
+
+
+${BINARIES}/engine_xdxf.o: ${SOURCES}/engine_xdxf.c ${INCLUDE}/engine_xdxf.h
+               @echo -e -n "\n+---------------- ENGINE XDXF -------------------------------------------------------+\n"
+               @echo -e -n   "| Compiling engine_xdxf module => engine_xdxf.o ...                                  |\n"
+               @gcc ${FLAGS} ${DEBUG} -c -fPIC ${SOURCES}/engine_xdxf.c -o ${BINARIES}/engine_xdxf.o 
+
+test: test.o
+               @echo "Linking test program..."
+               @gcc ${LIBS} ${DEBUG} ${DEBUG} -o ${SOURCES}/test ${BINARIES}/test.o
+               @echo -e "Building test program finished.\n"
+test.o:
+               @echo "Compiling test program..."
+               @gcc ${FLAGS} ${DEBUG} -c -o ${BINARIES}/test.o ${SOURCES}/test.c
+
+check:
+               @echo "Running test program:"
+               @run-standalone.sh ${SOURCES}/test
+
+clean :
+               @rm -f ${BINARIES}/*
+               @rm -f ${SOURCES}/test
+               @rm -f ${SOURCES}/*~
+               @rm -f *~
+               @rm -f ${INCLUDE}/*~
+               @rm -f ${SOURCES}/engine_xdxf.so

diff --git a/src/plugins/xdxf/autogen.sh b/src/plugins/xdxf/autogen.sh
new file mode 100755 (executable)
index 0000000..6b00028
--- /dev/null
+++ b/src/plugins/xdxf/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
+
+#[ "_""$1" != "_nogen" ] && aclocal ; libtoolize ; autoconf ; automake --add-missing ; automake
+
+[ "_""$1" != "_nogen" ] && ( aclocal ; libtoolize ; autoconf ; automake --add-missing ; automake )

diff --git a/src/plugins/xdxf/configure.ac b/src/plugins/xdxf/configure.ac
new file mode 100644 (file)
index 0000000..6313c6d
--- /dev/null
+++ b/src/plugins/xdxf/configure.ac
@@ -0,0 +1,22 @@
+AC_INIT([src/engine_xdxf.c])
+AM_INIT_AUTOMAKE(dbus_wrapper, 1.0)
+
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.0)
+PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= 2.0)
+PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0 >= 2.0)
+
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+
+AC_SUBST(GMODULE_CFLAGS)
+AC_SUBST(GMODULE_LIBS)
+
+AC_SUBST(GNOMEVFS_CFLAGS)
+AC_SUBST(GNOMEVFS_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/plugins/xdxf/src/Makefile.am b/src/plugins/xdxf/src/Makefile.am
new file mode 100644 (file)
index 0000000..bd11cd3
--- /dev/null
+++ b/src/plugins/xdxf/src/Makefile.am
@@ -0,0 +1,9 @@
+lib_LTLIBRARIES = libengine_xdxf.la
+libengine_xdxf_la_SOURCES = engine_xdxf.c
+libengine_xdxf_la_CFLAGS = $(GLIB_CFLAGS) $(GMODULE_CFLAGS)  $(GNOMEVFS_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/../../../include
+libengine_xdxf_la_LDFLAGS = $(GLIB_LIBS) $(GMODULE_LIBS)  $(GNOMEVFS_LIBS) -lexpat
+
+bin_PROGRAMS = test
+test_SOURCES = test.c
+test_CFLAGS = $(GLIB_CFLAGS) $(GMODULE_CFLAGS)  $(GNOMEVFS_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/../../../include
+test_LDFLAGS = $(GLIB_LIBS) $(GMODULE_LIBS)  $(GNOMEVFS_LIBS) -lexpat
\ No newline at end of file