automake based build system looks complete
authorwolk <wolek84@gmail.com>
Mon, 10 Nov 2008 13:59:41 +0000 (13:59 +0000)
committerwolk <wolek84@gmail.com>
Mon, 10 Nov 2008 13:59:41 +0000 (13:59 +0000)
git-svn-id: file:///svnroot/mdictionary/trunk@270 5bde0345-f819-0410-ac75-e5045f9217cc

12 files changed:
Makefile.am [new file with mode: 0644]
Makefile_old [new file with mode: 0644]
autogen.sh [new file with mode: 0755]
configure.ac [new file with mode: 0644]
src/Makefile.am [new file with mode: 0644]
src/bookmarks/Makefile.am [new file with mode: 0644]
src/bookmarks/bdb/configure.ac
src/dbus_wrapper/configure.ac
src/plugins/stardict/configure.ac
src/plugins/stardict/src/Makefile.am
src/plugins/xdxf/configure.ac
src/plugins/xdxf/src/Makefile.am

diff --git a/Makefile.am b/Makefile.am
new file mode 100644 (file)
index 0000000..dfa49b2
--- /dev/null
@@ -0,0 +1,2 @@
+AUTOMAKE_OPTIONS = foreign
+SUBDIRS = src
diff --git a/Makefile_old b/Makefile_old
new file mode 100644 (file)
index 0000000..9172285
--- /dev/null
@@ -0,0 +1,347 @@
+ARCH = `arch`
+REP_TAG = ../tags
+REP_BRANCH = branches
+
+DEB_REP_DIR = www
+
+#declaration of directory names
+BINARIES = bin
+SOURCE = src
+INCLUDE = include
+DATA = data
+PLUGINS = ${SOURCE}/plugins
+XDXF_PLUGIN = ${PLUGINS}/xdxf
+STARDICT_PLUGIN = ${PLUGINS}/stardict
+GUI = ${SOURCE}/gui
+MANAGER = ${SOURCE}/manager
+DBUS = ${SOURCE}/dbus_wrapper
+BOOKMARKS:=bdb
+BOOKMARKS_DIR = ${SOURCE}/bookmarks/${BOOKMARKS}
+DESTDIR = 
+
+ifeq (${BOOKMARKS}, sql)
+       SQLITE:=-DSQLITE=0
+endif
+
+ifeq (${BOOKMARKS}, sql3)
+       SQLITE:=-DSQLITE=3
+endif
+
+PACKAGES = packages
+
+#probably trash
+STARDICT = stardict
+APP_NAME = mDictionary
+
+#versions
+MAJOR_VER = 1
+MINOR_VER = 0
+PATCH_VER = 0
+RELEASE_MAJOR_VER = 1
+RELEASE_MINOR_VER = 0
+RELEASE_PATCH_VER = 0
+PACK_VER = 0
+FRM_VER = 0.1
+
+# VERSION_FILE = ./${INCLUDE}/ws_version.h
+
+#package structure
+GUI_PACK_NAME = mdictionarygui
+MNG_PACK_NAME = mdictionary
+PLUGINS_PACK_NAME = mdictionaryplugins
+BOOKMARKS_PACK_NAME = mdictionarybookmarks
+META_PACK_NAME = mdictionarydictionary
+
+GUI_EXECUTABLE = ${BINARIES}/mdictionary
+GUI_SERVICEFILE = org.maemo.mdictionaryGui.service
+GUI_DIRS = ${DESTDIR}/usr/bin ${DESTDIR}/usr/share/applications/hildon ${DESTDIR}/usr/share/pixmaps ${DESTDIR}/usr/share/mis ${DESTDIR}/usr/share/dbus-1/services ${DESTDIR}/usr/share/locale  
+#${DESTDIR}/usr/share/doc/mdictionarygui
+GUI_DBUS = ${DATA}/other/${GUI_SERVICEFILE}
+GUI_ICONS = ${DATA}/icons/mdictionary_icon.png ${DATA}/icons/mdictionary.png ${DATA}/icons/ws_top.png ${DATA}/icons/ws_warning_icon.png ${DATA}/icons/qgn_indi_search_mdictionary.png ${DATA}/icons/ws_tra.png ${DATA}/icons/mdictionary_about.png
+GUI_LOCALE = ${DATA}/locale/out/
+GUI_DOC = ${DATA}/docs/${GUI_PACK_NAME}/
+GUI_OTHER = ${DATA}/other/mdictionary.desktop
+GUI_MIS = ${DATA}/mis/mdictionary-search.xml
+
+MNG_EXECUTABLE = ${BINARIES}/mdictionaryManager 
+MNG_SERVICEFILE = org.maemo.mdictionaryManager.service
+MNG_LIB = ${BINARIES}/engine_bookmarks.so
+MNG_DIRS = ${DESTDIR}/usr/bin ${DESTDIR}/usr/lib/mdictionary ${DESTDIR}/usr/share/dbus-1/services  ${DESTDIR}/usr/share/mdictionary ${DESTDIR}/usr/share/doc/${MNG_PACK_NAME}
+MNG_DBUS = ${DATA}/other/${MNG_SERVICEFILE}
+MNG_OTHER = ${DATA}/dictionaries 
+
+MNG_DICT1 = ${DATA}/dictionaries/FinnishEnglish/comn_sdict02_finnish-english.dict.dz ${DATA}/dictionaries/FinnishEnglish/comn_sdict02_finnish-english.idx ${DATA}/dictionaries/FinnishEnglish/comn_sdict02_finnish-english.ifo ${DESTDIR}/usr/share/mdictionary/dictionaries/FinnishEnglish/
+MNG_DICT2 = ${DATA}/dictionaries/EnglishFinnish/dict.xdxf ${DATA}/dictionaries/EnglishFinnish/dict.cache ${DESTDIR}/usr/share/mdictionary/dictionaries/EnglishFinnish/
+
+MNG_DICT_DIRS = ${DESTDIR}/usr/share/mdictionary/dictionaries/FinnishEnglish/ ${DESTDIR}/usr/share/mdictionary/dictionaries/EnglishFinnish/
+
+MNG_BOOKMARKS = ${DATA}/bookmarks/${BOOKMARKS}/*
+MNG_DOC = ${DATA}/docs/${MNG_PACK_NAME}/
+
+PLUGINS_LIB = ${BINARIES}/engine_*.so
+PLUGINS_DIRS = ${DESTDIR}/usr/lib/mdictionary ${DESTDIR}/usr/share/pixmaps
+#${DESTDIR}/usr/share/doc/${PLUGINS_PACK_NAME} 
+PLUGINS_ICONS = ${DATA}/icons/engine_xdxf_icon.png
+PLUGINS_DOC = ${DATA}/docs/${PLUGINS_PACK_NAME}/
+
+META_DIRS = ${PACKAGES}/${META_PACK_NAME}/usr/share/doc/${META_PACK_NAME}
+META_DOC = ${DATA}/docs/${META_PACK_NAME}/
+
+MAIL_ADDRESS = mdictionary-devel@garage.maemo.org
+LOCALEDIR=/usr/share/locale
+GETTEXT_PACKAGE=mdictionary
+ALL_LINGUAS="en_GB"
+#APP_VER = ${MAJOR_VER}.${MINOR_VER}.`svn info | grep "Revision:" | awk '{print $$2}'`
+
+ifeq (${MAKECMDGOALS}, release-package)
+       APP_VER = ${RELEASE_MAJOR_VER}.${RELEASE_MINOR_VER}.${RELEASE_PATCH_VER}
+else
+       APP_VER = ${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}-build`svn log -r HEAD -q | grep -v -e -- | awk '{print $$1}' | tr -d r`
+endif
+
+FILES = ${DATA}/files_debbuild
+LOG_DIR = logs
+LOG_CLEAN = ${LOG_DIR}/clean.log
+LOG_BUILD = ${LOG_DIR}/build.log
+LOG_RUN = ${LOG_DIR}/run.log
+LOG_DEBS = ${LOG_DIR}/debs.log
+LOG_INST = ${LOG_DIR}/install.log
+
+first: build
+       @echo -e -n ""
+
+tag-version: clean
+               @install -d ${REP_TAG}/${APP_NAME}-${APP_VER}
+               @tar -czf ${REP_TAG}/${APP_NAME}-${APP_VER}/${APP_NAME}-${APP_VER}.tar.gz ../trunk/* --exclude .svn
+               @svn add ${REP_TAG}/${APP_NAME}-${APP_VER} 
+               @svn ci ${REP_TAG}/${APP_NAME}-${APP_VER} -m "Tagged new version: ${APP_NAME}-${APP_VER}"
+
+send-last:     debs
+               @tar -czf ${APP_NAME}-${APP_VER}.tar.gz *_${APP_VER}-${PACK_VER}_${ARCH}.deb
+               @echo -e -n "#!/bin/bash\n\
+                       mutt -x -a ~/debs.log -a ~/build.log -a ~/${APP_NAME}-${APP_VER}.tar.gz -s \"[mdictionary]: daily build - version ${APP_NAME}-${APP_VER}\" ${MAIL_ADDRESS} <~/mail.content\n\
+                       rm -f ~/${APP_NAME}-${APP_VER}.tar.gz\n" > mail.script
+
+               @chmod +x mail.script
+
+               @echo -e -n "\
+                       This message was generated automatically , please do not reply.\n\
+                       Attachment: ${APP_NAME}-${APP_VER}.tar.gz - tarball with the newest mdictionary's packages.\n\
+                       Attachment: build.log - logs from building binaries.\n\
+                       Attachment: debs.log - logs from making *.deb packages.\n\n\
+                       Automatic Building Framework ver: ${FRM_VER}\nCopyright 2006 ComArch S.A.\n" > mail.content
+               @scp ${APP_NAME}-${APP_VER}.tar.gz krzsas@localhost:~/
+               @scp ${LOG_BUILD} krzsas@localhost:~/
+               @scp ${LOG_DEBS} krzsas@localhost:~/
+               @scp mail.script krzsas@localhost:~/
+               @scp mail.content krzsas@localhost:~/
+               @rm -f mail.script
+               @rm -f mail.content
+               @ssh krzsas@localhost  ./mail.script
+
+localization:
+               @echo -e -n "Generating locale...\n"
+               @echo -e -n "Generating locale...\n" > ${LOG_BUILD}
+               
+               @./generate_locale ${DATA}/locale/ ${GUI_LOCALE}
+               @echo -e -n "Locale generation successfully completed...\n"
+               @echo -e -n "Locale generation successfully completed...\n" > ${LOG_BUILD}
+
+build: pre-build  ${BINARIES}/ws_dbus.o ${GUI_EXECUTABLE} ${MNG_EXECUTABLE} ${BINARIES}/engine_bookmarks.so plugins
+               @echo -e -n "\nBuilding mdictionary is finished.\n"
+
+pre-build:
+               @echo -e -n "Building mdictionary... \n"
+               @echo -e -n "" > ${LOG_BUILD}
+
+plugins: ${BINARIES}/engine_xdxf.so ${BINARIES}/engine_stardict.so
+               
+
+${MNG_EXECUTABLE}: 
+# update-version
+               @echo -e -n "**--> Compiling Manager...\n"
+               @echo -e -n "**--> Compiling Manager...\n" >> ${LOG_BUILD}
+               @make SQLITE=${SQLITE} -C ${MANAGER} >> ${LOG_BUILD}
+
+${BINARIES}/ws_dbus.o:
+               @echo -e -n "**--> Compiling D-BUS Wrapper... \n"
+               @echo -e -n "**--> Compiling D-BUS Wrapper... \n" >> ${LOG_BUILD}
+#              @cd ${DBUS} && make >> ../../${LOG_BUILD}
+               @make -C ${DBUS} >> ${LOG_BUILD}
+
+${GUI_EXECUTABLE}: 
+#update-version
+               @echo -e -n "**--> Compiling User Interface...\n"
+               @echo -e -n "**--> Compiling User Interface...\n" >> ${LOG_BUILD}
+#              @cd ${GUI} && make APP_VER=${APP_VER} >> ../../${LOG_BUILD}
+               @make APP_VER=${APP_VER} -C ${GUI} >> ${LOG_BUILD}
+
+${BINARIES}/engine_xdxf.so: 
+# update-version
+               @echo -e -n "**--> Compiling XDXF Engine...\n"
+               @echo -e -n "**--> Compiling XDXF Engine...\n" >> ${LOG_BUILD}
+#              @cd ${XDXF_PLUGIN} && make >> ../../../${LOG_BUILD}
+               @make -C ${XDXF_PLUGIN} >> ${LOG_BUILD}
+
+${BINARIES}/engine_stardict.so:  
+# update-version
+               @echo -e -n "**--> Compiling StarDict Engine...\n"
+               @echo -e -n "**--> Compiling StarDict Engine...\n" >> ${LOG_BUILD}
+#              @cd ${STARDICT_PLUGIN} && make >> ../../../${LOG_BUILD}
+               @make -C ${STARDICT_PLUGIN} >> ${LOG_BUILD}
+
+${BINARIES}/engine_bookmarks.so: 
+# update-version
+               @echo -e -n "**--> Compiling Bookmarks...\n"
+               @echo -e -n "**--> Compiling Bookmarks...\n" >> ${LOG_BUILD}
+               @make -C ${BOOKMARKS_DIR} >> ${LOG_BUILD}
+               
+clean-logs:     
+               @echo -e -n "Cleaning all logs\n"
+               @rm -f ${LOG_DIR}/*.log
+
+clean: clean-logs
+               @-echo -e -n "Cleaning project directories\n"
+               @echo -e -n "" > ${LOG_CLEAN}
+               @-rm -f ${BINARIES}/* >> ${LOG_CLEAN} 2>> ${LOG_CLEAN}
+               @-rm -f *~ >> ${LOG_CLEAN} 2>> ${LOG_CLEAN}
+               @-rm -f *.deb >> ${LOG_CLEAN} 2>> ${LOG_CLEAN}
+               @-rm -rf ${PACKAGES}/*
+               @-make -C ${GUI} clean >> ${LOG_CLEAN} 2>> ${LOG_CLEAN}
+               @-make -C ${DBUS} clean >> ${LOG_CLEAN} 2>> ${LOG_CLEAN}
+               @-make -C ${XDXF_PLUGIN} clean >> ${LOG_CLEAN} 2>> ${LOG_CLEAN}
+               @-make -C ${STARDICT_PLUGIN} clean >> ${LOG_CLEAN} 2>> ${LOG_CLEAN}
+               @-cd ${MANAGER} && make clean >> ../../${LOG_CLEAN} 2>> ../../${LOG_CLEAN}
+               @-make -C ${MANAGER} clean >> ${LOG_CLEAN} 2>> ${LOG_CLEAN}
+               @find src/bookmarks/ -mindepth 1 -maxdepth 1 -type d -not -name .svn -exec make -C {} clean >> ${LOG_CLEAN} 2>> ${LOG_CLEAN} \;
+               @-rm -rf ${GUI_LOCALE}*
+               
+#              @-cd ${GUI} && make clean >> ../../${LOG_CLEAN} 2>> ../../${LOG_CLEAN}
+#              @-cd ${DBUS} && make clean >> ../../${LOG_CLEAN} 2>> ../../${LOG_CLEAN}
+#              @-cd ${XDXF_PLUGIN} && make clean >> ../../../${LOG_CLEAN} 2>> ../../../${LOG_CLEAN}
+#              @-cd ${STARDICT_PLUGIN} && make clean >> ../../../${LOG_CLEAN} 2>> ../../../${LOG_CLEAN}
+#              @-cd ${BOOKMARKS_DIR} && make clean >> ../../../${LOG_CLEAN} 2>> ../../../${LOG_CLEAN}
+
+run: clean install entries run-dict clean-temp
+
+
+run-dict:
+               @run-standalone.sh mdictionaryManager
+
+clean-temp:
+               @-fakeroot rm -rf /usr/share/mdictionary
+               @-fakeroot rm -rf /usr/lib/mdictionary
+               @-fakeroot rm -rf /usr/include/mdictionary
+               @-fakeroot rm -f /etc/others-menu/extra_applications/0112_mdictionarygui.desktop
+               @-fakeroot rm -f /usr/share/applications/hildon/mdictionarygui.desktop 
+               @-fakeroot rm -f /usr/share/pixmaps/mdictionary.png 
+               @-fakeroot rm -f /usr/share/pixmaps/mdictionary_icon.png
+               @-fakeroot rm -f /usr/bin/mdictionary
+               @-fakeroot rm -f /usr/bin/mdictionaryManager
+               @-fakeroot rm -f /usr/share/applications/hildon/mdictionarygui.desktop 
+               @-fakeroot rm -f /usr/lib/mdictionary/engine_xdxf.so
+               @-fakeroot rm -f /usr/lib/mdictionary/engine_stardict.so
+
+#              gconftool-2 --recursive-unset /apps/maemo/mdictionary
+
+install-manager: localization ${BINARIES}/ws_dbus.o  ${BINARIES}/engine_bookmarks.so ${MNG_EXECUTABLE}
+               @install -d ${MNG_DIRS}
+               @cp ${MNG_EXECUTABLE} ${DESTDIR}/usr/bin
+               @cp ${MNG_LIB} ${DESTDIR}/usr/lib/mdictionary
+               @cp ${MNG_DBUS} ${DESTDIR}/usr/share/dbus-1/services
+               @find  ${MNG_DOC} -type f -not -path *.svn* -exec cp {} ${DESTDIR}/usr/share/doc/${MNG_PACK_NAME} \;
+               
+#              @install -d ${MNG_DICT_DIRS}
+#              @cp ${MNG_DICT1}
+#              @cp ${MNG_DICT2}
+               
+               @install -d ${DESTDIR}/usr/share/mdictionary/dictionaries/bookmarks
+               @cp -rf ${MNG_BOOKMARKS} ${DESTDIR}/usr/share/mdictionary/dictionaries/bookmarks
+               
+install-gui:   ${BINARIES}/ws_dbus.o ${GUI_EXECUTABLE} 
+               @install -d ${GUI_DIRS}
+               @cp ${GUI_EXECUTABLE} ${DESTDIR}/usr/bin
+               @cp ${GUI_ICONS} ${DESTDIR}/usr/share/pixmaps
+               @cp ${GUI_DBUS} ${DESTDIR}/usr/share/dbus-1/services
+               @cp ${GUI_OTHER} ${DESTDIR}/usr/share/applications/hildon
+               @cp ${GUI_MIS} ${DESTDIR}/usr/share/mis
+               @cp -a ${GUI_LOCALE}* ${DESTDIR}/usr/share/locale/              
+#              @find  ${GUI_DOC} -type f -not -path *.svn* -exec cp {} ${DESTDIR}/usr/share/doc/${GUI_PACK_NAME} \;
+
+install-plugins: plugins
+               @install -d ${PLUGINS_DIRS}
+               @cp ${PLUGINS_LIB} ${DESTDIR}/usr/lib/mdictionary
+               @cp ${PLUGINS_ICONS} ${DESTDIR}/usr/share/pixmaps
+               @install -d ${MNG_DICT_DIRS}
+               @cp ${MNG_DICT1}
+               @cp ${MNG_DICT2}
+#              @find  ${PLUGINS_DOC} -type f -not -path *.svn* -exec cp {} ${DESTDIR}/usr/share/doc/${PLUGINS_PACK_NAME} \;
+
+install-mdictionary:   install-manager install-gui install-plugins
+
+install:       install-manager install-gui install-plugins
+               @echo -e "\n\nIf you are installing mdictionary, please run 'make entries', before running the application ( not as root )\n\n"
+
+entries:       
+               gconftool-2 --type string --set /apps/maemo/mdictionary/dictionaries/StarDictSampleDict/name "Polish - English Sample Dictionary"
+               gconftool-2 --type string --set /apps/maemo/mdictionary/dictionaries/StarDictSampleDict/path "/usr/share/mdictionary/dictionaries/StarDictSampleDict"
+               gconftool-2 --type bool --set /apps/maemo/mdictionary/dictionaries/StarDictSampleDict/active true
+               gconftool-2 --type bool --set /apps/maemo/mdictionary/dictionaries/StarDictSampleDict/optimized false
+               gconftool-2 --type string --set /apps/maemo/mdictionary/dictionaries/XDXFSampleDict/name "English - Polish Sample Dictionary"
+               gconftool-2 --type string --set /apps/maemo/mdictionary/dictionaries/XDXFSampleDict/path "/usr/share/mdictionary/dictionaries/XDXFSampleDict"
+               gconftool-2 --type bool --set /apps/maemo/mdictionary/dictionaries/XDXFSampleDict/active true
+               gconftool-2 --type bool --set /apps/maemo/mdictionary/dictionaries/XDXFSampleDict/optimized false
+               
+               gconftool-2 --type string --set /apps/maemo/mdictionary/engines/bookmarks/path "/usr/lib/mdictionary/engine_bookmarks.so"
+               gconftool-2 --type string --set /apps/maemo/mdictionary/dictionaries/bookmarks/name "Bookmarks"
+               gconftool-2 --type string --set /apps/maemo/mdictionary/dictionaries/bookmarks/path "/usr/share/mdictionary/dictionaries/bookmarks"
+               gconftool-2 --type bool --set /apps/maemo/mdictionary/dictionaries/bookmarks/active false
+               gconftool-2 --type bool --set /apps/maemo/mdictionary/dictionaries/bookmarks/optimized true
+               chmod -R 0777 /usr/share/mdictionary/dictionaries
+               
+               gconftool-2 --type string --set /apps/maemo/mdictionary/engines/xdxf/path "/usr/lib/mdictionary/engine_xdxf.so"
+               gconftool-2 --type string --set /apps/maemo/mdictionary/engines/stardict/path "/usr/lib/mdictionary/engine_stardict.so"
+               
+#              maemo-select-menu-location mdictionary.desktop
+
+
+install_deb: clean-inst-log uninstall eng-deb-i mng-deb-i gui-deb-i
+               @echo -e -n "All packages have been installed/reinstalled.\n"
+
+clean-inst-log: 
+               @echo -n "" > ${LOG_INST}
+
+uninstall:
+               @-fakeroot dpkg --purge mdictionary
+#              @-fakeroot dpkg --purge mdictionarydictionary
+
+display: access
+               @fakeroot su ${USER} -c 'af-sb-init.sh start'   
+
+display-s: access
+               @fakeroot su ${USER} -c 'af-sb-init.sh stop'
+
+display-r: access
+               @fakeroot su ${USER} -c 'af-sb-init.sh restart'
+
+access:
+               @fakeroot chmod 0777 /var/run
+
+release-package: clean debs meta-package
+               @echo "Release package generation successfully completed"
+
+snapshot: tag-version send-last
+
+repo:  release-package meta-package
+
+       @rm -rf ${DEB_REP_DIR}
+       @./generate_repo ${DEB_REP_DIR}
+       
+package: clean
+       dpkg-buildpackage -rfakeroot
+
+.PHONY: docs
+docs:
+       doxygen Doxyfile
+       # doxygen always put wrong meta charset tag - we have repair it manualy
+       sed -i -e "s/charset=iso-8859-1/charset=utf-8/g" doc/html/*html
diff --git a/autogen.sh b/autogen.sh
new file mode 100755 (executable)
index 0000000..935031d
--- /dev/null
@@ -0,0 +1,23 @@
+#!/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
+
+if [ "_""$1" != "_nogen" ] 
+then           
+               aclocal ; libtoolize ; autoconf ; automake --add-missing ; automake
+fi
+
+cd src/dbus_wrapper    
+./autogen.sh "$1"
+cd ../gui
+./autogen.sh "$1"
+cd ../bookmarks/bdb
+./autogen.sh "$1"
+cd ../../manager  
+./autogen.sh "$1"
+cd ../plugins/xdxf
+./autogen.sh "$1"
+cd ../stardict
+./autogen.sh "$1"
+
diff --git a/configure.ac b/configure.ac
new file mode 100644 (file)
index 0000000..1525ad3
--- /dev/null
@@ -0,0 +1,13 @@
+AC_INIT
+AC_CONFIG_AUX_DIR([.])
+
+AM_INIT_AUTOMAKE(mDictionary, 1.0)
+
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_LIBTOOL
+
+AC_CONFIG_FILES(Makefile src/Makefile src/bookmarks/Makefile src/plugins/Makefile)
+AC_CONFIG_SUBDIRS([src/gui src/manager src/bookmarks/bdb src/plugins/stardict src/plugins/xdxf])
+
+AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644 (file)
index 0000000..193256d
--- /dev/null
@@ -0,0 +1,2 @@
+AUTOMAKE_OPTIONS = foreign
+SUBDIRS = dbus_wrapper gui  manager bookmarks plugins 
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
new file mode 100644 (file)
index 0000000..b007807
--- /dev/null
@@ -0,0 +1 @@
+SUBDIRS = bdb
index 7834d48..721885e 100644 (file)
@@ -1,4 +1,6 @@
 AC_INIT([src/berkeleyRead.c])
+AC_CONFIG_AUX_DIR([.])
+
 AM_INIT_AUTOMAKE(bdbprint, 1.0)
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.0)
index a69cd2b..f087a77 100644 (file)
@@ -1,5 +1,6 @@
 AC_INIT([src/ws_dbus.c])
-AM_INIT_AUTOMAKE(dbus_wrapper, 1.0)
+AC_CONFIG_AUX_DIR([.])
+AM_INIT_AUTOMAKE(ws_dbus, 1.0)
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.0)
 PKG_CHECK_MODULES(OSSO, libosso >= 2.0)
@@ -13,6 +14,5 @@ AC_SUBST(OSSO_LIBS)
 AC_PROG_CC
 AC_PROG_INSTALL
 AM_PROG_LIBTOOL
-
-AC_OUTPUT([  Makefile 
-                          src/Makefile])
\ No newline at end of file
+AC_CONFIG_FILES(Makefile   src/Makefile)
+AC_OUTPUT
index 666519f..fdbc507 100644 (file)
@@ -1,4 +1,6 @@
 AC_INIT([src/engine_stardict.c])
+AC_CONFIG_AUX_DIR([.])
+
 AM_INIT_AUTOMAKE(stardict, 1.0)
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.0)
index 21da58b..07f0885 100644 (file)
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libstardict_la
+lib_LTLIBRARIES = libstardict.la
 libstardict_la_SOURCES = engine_stardict.c
 libstardict_la_CFLAGS = $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(GNOMEVFS_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/../../../include
-libstardict_la_LDFLAGS = $(GLIB_LIBS) $(GMODULE_LIBS) $(GNOMEVFS_LIBS) -lz -shared $(top_srcdir)/precompiled/$(shell arch)/*.o
\ No newline at end of file
+libstardict_la_LDFLAGS = $(GLIB_LIBS) $(GMODULE_LIBS) $(GNOMEVFS_LIBS) -lz -shared $(top_srcdir)/precompiled/$(shell arch)/*.o
index 6313c6d..16563eb 100644 (file)
@@ -1,5 +1,7 @@
 AC_INIT([src/engine_xdxf.c])
-AM_INIT_AUTOMAKE(dbus_wrapper, 1.0)
+AC_CONFIG_AUX_DIR([.])
+
+AM_INIT_AUTOMAKE(engine_xdxf, 1.0)
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.0)
 PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= 2.0)
index bd11cd3..2995e7a 100644 (file)
@@ -3,7 +3,7 @@ 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
+## 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