Index: .cvsignore
===================================================================
RCS file: /sources/gnokii/gnokii/.cvsignore,v
retrieving revision 1.1
diff -u -p -r1.1 .cvsignore
--- .cvsignore	2 May 2006 16:39:57 -0000	1.1
+++ .cvsignore	29 Nov 2007 16:00:08 -0000
@@ -7,4 +7,5 @@ config.status
 configure
 intl
 libtool
-
+Makefile
+Makefile.in
Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- Makefile	13 Nov 2007 20:59:33 -0000	1.146
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,173 +0,0 @@
-
-#
-# $Id: Makefile,v 1.146 2007/11/13 20:59:33 pkot Exp $
-#
-# Makefile for the GNOKII tool suite.
-#
-# Copyright (C) 1999 Hugh Blemings & Pavel Jan?k ml.
-#               2000 Karel Zak
-#
-
-TOPDIR=.
-
-#
-# Makefile.global contains gnokii global settings
-#
-include ${TOPDIR}/Makefile.global
-
-BIN_DIRS = gnokii
-
-ifndef WIN32
-BIN_DIRS += gnokiid utils
-endif
-
-DIRS += $(INTL_DIR) \
-	common \
-	$(BIN_DIRS) \
-	$(POSUB)
-
-GTK_DIRS =	xgnokii
-
-INSTALL_DIRS =	$(BIN_DIRS) \
-		common
-
-INSTALL_SIMPLE = $(INTL_DIR) \
-		 $(POSUB)
-
-INSTALL_INCLUDES = include \
-		   common
-
-DOCS_DIR = 	Docs
-
-TOPLEVEL_DOCS = ChangeLog \
-		COPYING \
-		COPYRIGHT \
-		MAINTAINERS \
-		TODO
-
-all: compile
-
-compile: $(DIRS)
-	@if [ "$(GTK_LIBS)" ]; then \
-		for dir in $(GTK_DIRS); do \
-		    if [ -e $$dir/Makefile ]; then \
-			$(MAKE) -C $$dir; \
-		    fi; \
-		done \
-	fi
-	@echo "done"
-
-# build the apps after building the library   
-$(BIN_DIRS) $(GTK_DIRS): common
-
-$(DIRS):
-	$(MAKE) -C $@
-
-clean:
-	$(RM) *~ *.orig *.rej include/*~ include/*.orig include/*.rej testsuite/myout*
-	@for dir in $(DIRS); do \
-	    if [ -e $$dir/Makefile ]; then \
-		$(MAKE) -C $$dir clean; \
-	    fi; \
-	done
-
-	@if [ "$(GTK_LIBS)" ]; then \
-		for dir in $(GTK_DIRS); do \
-		    if [ -e $$dir/Makefile ]; then \
-			$(MAKE) -C $$dir clean; \
-		    fi; \
-		done \
-	fi
-
-	$(MAKE) -C Docs clean
-
-	@echo "done"
-
-distclean: clean
-	$(MAKE) -C common distclean
-	$(RM) Makefile.global config.cache config.log config.status \
-		include/config.h \
-		packaging/RedHat/gnokii.spec \
-		packaging/Slackware/SlackBuild \
-		packaging/Slackware/SlackBuild-xgnokii \
-		po/Makefile.in
-	$(RM) `$(FIND) . -name "*~"`
-	@echo "done"
-
-dep:
-	@for dir in $(DIRS); do \
-	    if [ -e $$dir/Makefile ]; then \
-		$(MAKE) -C $$dir dep; \
-	    fi; \
-	done
-
-	@if [ "$(GTK_LIBS)" ]; then \
-		for dir in $(GTK_DIRS); do \
-		    if [ -e $$dir/Makefile ]; then \
-			$(MAKE) -C $$dir dep; \
-		    fi; \
-		done \
-	fi
-	@echo "done"
-
-test:
-	( cd testsuite; ./testit )
-
-install-binaries: compile
-	@for dir in $(INSTALL_DIRS); do \
-		if [ -e $$dir/Makefile ]; then \
-			$(MAKE) -C $$dir install; \
-		fi; \
-	done
-
-	@for dir in $(INSTALL_SIMPLE); do \
-		if [ -e $$dir/Makefile ]; then \
-			$(MAKE) -C $$dir install; \
-		fi; \
-	done
-
-	@if [ "$(GTK_LIBS)" ]; then \
-		for dir in $(GTK_DIRS); do \
-		    if [ -e $$dir/Makefile ]; then \
-			$(MAKE) -C $$dir install; \
-		    fi; \
-		done \
-	fi
-
-	@echo "done"
-
-install-includes:
-	@for dir in $(INSTALL_INCLUDES); do \
-		if [ -e $$dir/Makefile ]; then \
-			$(MAKE) -C $$dir install-devel; \
-		fi; \
-	done
-	@if [ "$(GTK_LIBS)" ]; then \
-		for dir in $(GTK_DIRS); do \
-		    if [ -e $$dir/Makefile ]; then \
-			$(MAKE) -C $$dir install-devel; \
-		    fi; \
-		done \
-	fi
-	@echo "done"
-
-
-install-docs:
-	$(INSTALL) -d $(DESTDIR)$(docdir)
-	@for xxx in $(TOPLEVEL_DOCS); do \
-	    if [ -e $$xxx ]; then \
-		$(INSTALL_DATA) $$xxx $(DESTDIR)$(docdir)/$$xxx; \
-	    fi; \
-	done
-	$(MAKE) -C $(DOCS_DIR) install
-	@echo "done"
-
-install-docs-devel:
-	$(MAKE) -C $(DOCS_DIR) install-devel
-	@echo "done"
-
-install: compile install-binaries install-docs
-
-install-devel: compile install-includes install-docs-devel
-
-.PHONY: all compile install clean distclean dep depend install-binaries install-docs install-docs-devel $(DIRS)
Index: Makefile.am
===================================================================
RCS file: Makefile.am
diff -N Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile.am	29 Nov 2007 16:00:09 -0000
@@ -0,0 +1,28 @@
+SUBDIRS = include common gnokii po
+
+# FIXME add Docs
+
+if WIN32
+else
+SUBDIRS += gnokiid utils
+endif
+
+if HAVE_GTK
+SUBDIRS += xgnokii
+endif
+
+if GLIB
+# FIXME
+#SUBDIRS += smsd
+endif
+
+DIST_SUBDIRS = include Docs common gnokii gnokiid utils xgnokii smsd po
+
+EXTRA_DIST = ChangeLog \
+		COPYING \
+		COPYRIGHT \
+		MAINTAINERS \
+		TODO
+
+
+ACLOCAL_AMFLAGS = -I m4
Index: autogen.sh
===================================================================
RCS file: /sources/gnokii/gnokii/autogen.sh,v
retrieving revision 1.10
diff -u -p -r1.10 autogen.sh
--- autogen.sh	25 Nov 2006 20:07:43 -0000	1.10
+++ autogen.sh	29 Nov 2007 16:00:09 -0000
@@ -1,12 +1,13 @@
 #!/bin/sh
 
-autopoint -f
 libtoolize -c -f
-AC_LOCAL_FLAGS="-I m4"
+glib-gettextize -f
+AC_LOCAL_FLAGS="-Im4/"
 if [ "`uname -s`"x = "FreeBSD"x ]; then
 	AC_LOCAL_FLAGS="${AC_LOCAL_FLAGS} -I /usr/local/share/aclocal"
 fi
 aclocal ${AC_LOCAL_FLAGS}
-autoheader
+autoheader -Im4/
+automake --add-missing
 autoconf
 ./configure "$@"
Index: configure.in
===================================================================
RCS file: /sources/gnokii/gnokii/configure.in,v
retrieving revision 1.179
diff -u -p -r1.179 configure.in
--- configure.in	11 Nov 2007 17:19:38 -0000	1.179
+++ configure.in	29 Nov 2007 16:00:09 -0000
@@ -1,18 +1,27 @@
 dnl
 dnl Makefile for the GNOKII tool suite.
 dnl
-dnl  Copyright (C) 1999 Hugh Blemings & Pavel Jan?k ml.
-dnl                2000 Karel Zak, Pawe? Kot
+dnl  Copyright (C) 1999 Hugh Blemings & Pavel Jan?k ml.
+dnl                2000 Karel Zak, Pawe? Kot
 dnl                2002 BORBELY Zoltan
 dnl
 dnl  $Id: configure.in,v 1.179 2007/11/11 17:19:38 pkot Exp $
 dnl
 
-AC_INIT(gnokii/gnokii.c)
+AC_INIT([gnokii],
+	 [0.6.22],
+	 [http://www.gnokii.org])
 
 AC_CONFIG_AUX_DIR(config)
 
 AC_CANONICAL_SYSTEM
+
+AC_CONFIG_SRCDIR([gnokii/gnokii.c])
+dnl gettext doesn't like the config.status being somewhere else :(
+dnl AC_CONFIG_AUX_DIR(config)
+
+AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip])
+
 AC_PREFIX_DEFAULT("/usr/local")
 
 dnl ======================== Checks for programs.
@@ -57,31 +66,11 @@ AC_RELOCATABLE
 AM_ICONV
 
 dnl ======================== Default setting
-ALL_LINGUAS="cs de et fi nl sk pl it sl fr zh_CN sv pt"
-AC_CHECK_HEADERS(libintl.h)
-AM_GNU_GETTEXT_VERSION(0.14.1)
-AM_GNU_GETTEXT([no-libtool])
-AC_CHECK_FUNCS(locale_charset)
-if test x$am_cv_langinfo_codeset != xyes -a x$ac_cv_func_locale_charset != xyes ; then
-	NEED_LOCALE_CHARSET=1
-fi
-# if msgfmt or xgettext is not present on the system, disable nls build
-if test "$MSGFMT" = ":" -o "$XGETTEXT" = ":"; then
-	USE_NLS="no"
-fi
-
-dnl ======================== Check for include/config.h.in
-AC_MSG_CHECKING([for include/config.h.in])
-if test -f include/config.h.in; then
-	AC_MSG_RESULT(yes)
-else
-	AC_MSG_RESULT(no)
-	echo '*************************************************'
-	echo 'include/config.h.in missing, run autoheader first'
-	echo 'autoheader is part of the autoconf package'
-	echo '*************************************************'
-	exit 1
-fi
+dnl Add the languages which your application supports to po/LINGUAS
+GETTEXT_PACKAGE=gnokii
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define to the Gettext package name])
+AC_SUBST(GETTEXT_PACKAGE)
+AM_GLIB_GNU_GETTEXT
 
 dnl Let us have $prefix variable available here
 test x"$prefix" = xNONE && prefix="$ac_default_prefix"
@@ -438,7 +427,7 @@ if test "$enable_bluetooth" == "yes"; th
 		AC_DEFINE(HAVE_BLUETOOTH_NETGRAPH,[],[Compile on FreeBSD])
 		USE_BLUETOOTH="yes"
 		AC_CHECK_LIB(bluetooth, bt_aton,
-			    [LIBS="$LIBS -lbluetooth" AC_DEFINE(HAVE_BT_ATON,[],[Define to 1 if you have the \`bt_aton' function.])])
+			    [LIBS="$LIBS -lbluetooth" AC_DEFINE(HAVE_BT_ATON,[],[Define to 1 if you have the 'bt_aton' function.])])
 	fi
 fi
 
@@ -474,6 +463,8 @@ fi
 
 dnl ======================== Checks for X base support
 
+found_gtk=no
+
 if test "$no_x" = yes -o "$with_x" = "no"; then
    x_support="no"
    XPM_CFLAGS=""
@@ -543,9 +534,23 @@ else
    fi
 fi
 
+AM_CONDITIONAL(HAVE_GTK, test "x$found_gtk" = "xyes")
+
 dnl ======================== Check for libsocket
 AC_CHECK_LIB(socket, socket)
 
+dnl ======================== Checks for X base support
+
+found_glib=no
+
+PKG_CHECK_MODULES(GLIB, glib-2.0, found_glib=yes, found_glib=no)
+if test "$found_glib" = no; then
+	AC_MSG_WARN(Cannot find glib 2.0.)
+	AC_MSG_WARN(Disabling smsd.)
+fi
+
+AM_CONDITIONAL(GLIB, test "x$found_glib" = "xyes")
+
 dnl ======================== Additional switches
 
 AC_ARG_ENABLE(security,
@@ -578,6 +583,8 @@ AC_ARG_ENABLE(win32,
    [ win32="no"]
 )
 
+AM_CONDITIONAL(WIN32, test "x$WIN32" = "x1")
+
 AC_ARG_ENABLE(unix98test,
    [  --enable-unix98test     if you want to disable UNIX98 test and assume to use it
                           default is enabled],
@@ -655,20 +662,10 @@ AC_HEADER_TIME
 AC_STRUCT_TM
 AC_CHECK_TYPE([u_int8_t],
     [AC_DEFINE([HAVE_U_INT8_T], 1, 
-       [Define to 1 if the system has the type `u_int8_t'.])])
+       [Define to 1 if the system has the type 'u_int8_t'.])])
 
-AC_CACHE_CHECK(for long long, ac_cv_c_long_long,
-	[AC_TRY_RUN([int main() { long long foo = 0; exit(sizeof(long long) < sizeof(long)); }],
-		ac_cv_c_long_long=yes, ac_cv_c_long_long=no, ac_cv_c_long_long=no)])
-if test $ac_cv_c_long_long = yes; then
-	AC_DEFINE(HAVE_LONG_LONG)
-fi
-AC_CACHE_CHECK(for long double, ac_cv_c_long_double,
-	[AC_TRY_RUN([int main() { long double foo = 0.0; exit(sizeof(long double) < sizeof(double)); }],
-		ac_cv_c_long_double=yes, ac_cv_c_long_double=no, ac_cv_c_long_double=no)])
-if test $ac_cv_c_long_double = yes; then
-	AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if your compiler supports the \`long double' type.])
-fi
+AC_TYPE_LONG_LONG_INT
+AC_TYPE_LONG_DOUBLE
 
 AC_CACHE_CHECK(for __ptr_t, ac_cv_c___ptr_t,
 	[AC_TRY_COMPILE([#include <stdio.h>],
@@ -755,7 +752,7 @@ case "$build_os" in
    ;;
 esac
 
-AC_CONFIG_HEADER(include/config.h)
+AC_CONFIG_HEADERS([include/config.h])
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
@@ -787,17 +784,26 @@ AC_SUBST(WIN32_CROSS)
 AC_SUBST(HAVE_LIBICAL)
 AC_SUBST(HAVE_LIBUSB)
 
-AC_OUTPUT(
-   Makefile.global
-   intl/Makefile
-   po/Makefile.in
-   packaging/RedHat/gnokii.spec
-   packaging/Slackware/SlackBuild
-   packaging/Slackware/SlackBuild-xgnokii
-   common/gnokii.pc
-   xgnokii/xgnokii.pc
-   )
-
+AC_OUTPUT( po/Makefile.in
+	  Makefile
+	  include/Makefile
+	  include/win32/Makefile
+	  include/data/Makefile
+	  include/devices/Makefile
+	  include/phones/Makefile
+	  include/links/Makefile
+	  include/gnokii/Makefile
+	  common/Makefile
+	  common/data/Makefile
+	  common/devices/Makefile
+	  common/links/Makefile
+	  common/phones/Makefile
+	  gnokii/Makefile
+	  gnokiid/Makefile
+	  utils/Makefile
+	  xgnokii/Makefile
+	  po/Makefile
+  )
 
 dnl ======================== Final report
 
@@ -819,7 +825,8 @@ echo "
     Host system:        $host_os
     Gnokii version:     $VERSION
     Xgnokii version:    $XVERSION
-    X (GTK) support:    $x_support
+    X (GTK+) support:   $x_support
+    smsd support:       $found_glib
     Debug:              $debug
     XDebug:             $xdebug
     RLPDebug:           $rlpdebug
@@ -838,3 +845,4 @@ echo "
   Type '${MAKE}' for compilation and then '${MAKE} install', to
   install gnokii.
 "
+
Index: common/.cvsignore
===================================================================
RCS file: /sources/gnokii/gnokii/common/.cvsignore,v
retrieving revision 1.2
diff -u -p -r1.2 .cvsignore
--- common/.cvsignore	2 May 2006 16:39:57 -0000	1.2
+++ common/.cvsignore	29 Nov 2007 16:00:09 -0000
@@ -4,4 +4,5 @@
 *.la
 gnokii.pc
 gnvcal.c
-
+Makefile
+Makefile.in
Index: common/Makefile
===================================================================
RCS file: common/Makefile
diff -N common/Makefile
--- common/Makefile	24 Nov 2007 11:26:23 -0000	1.103
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,122 +0,0 @@
-#
-# $Id: Makefile,v 1.103 2007/11/24 11:26:23 pkot Exp $
-#
-# Makefile for the GNOKII tool suite.
-#
-# Copyright (C) 1999 Hugh Blemings & Pavel Jan?k ml.
-#               2000 Karel Zak
-#		2002-2005 Pawel Kot
-#
-
-#
-# For this common directory is used "subsystem.la" .la files concept.
-#   (the list of object files to be linked together (to COMMON.la),
-#   and other dirs is used this _one_ file (instead of all OBJS)
-#
-
-TOPDIR=..
-include $(TOPDIR)/Makefile.global
-
-# REMEMBER: if you change the numbers below, please change them in gnokii.h as well.
-# Change it in the following manner
-#  - if you change the code and don't change API, increase GNOKII_RELEASE
-#  - if you change API in backward compatible manner (adding things),
-#    increase GNOKII_MAJOR, GNOKII_MINOR, set GNOKII_RELEASE to 0
-#  - if you change API in backward incompatible manner (removing things,
-#    changing things), increase GNOKII_MAJOR, set GNOKII_RELEASE to 0
-# Change is just once per release!
-GNOKII_MAJOR = 9
-GNOKII_MINOR = 6
-GNOKII_RELEASE = 0
-ifdef WIN32_CROSS
-LIBTOOL_UNDEF = -no-undefined
-LIBTOOL_VER = -version-info $(GNOKII_MAJOR):$(GNOKII_RELEASE):$(GNOKII_MINOR) -avoid-version
-LIBTOOL_RPATH=-rpath $(libdir)
-LDLIBS += -lws2_32 -lwinmm
-else
-LIBTOOL_VER = -version-info $(GNOKII_MAJOR):$(GNOKII_RELEASE):$(GNOKII_MINOR)
-LIBTOOL_RPATH=-rpath $(libdir)
-endif
-
-ifndef WIN32
-DATA_DIR = data
-endif
-
-DIRS += phones \
-	links \
-	devices \
-	$(DATA_DIR)
-
-LIBS   += $(LIBPCSCLITE_LIBS)
-
-OBJS =	libfunctions.lo \
-	gsm-api.lo \
-	gsm-error.lo \
-	gsm-statemachine.lo \
-	cfgreader.lo \
-	device.lo \
-	vcard.lo \
-	vcal.lo \
-	gnvcal.lo \
-	ldif.lo \
-	gsm-networks.lo \
-	gsm-filetypes.lo \
-	readmidi.lo \
-	gsm-ringtones.lo \
-	gsm-bitmaps.lo \
-	gsm-sms.lo \
-	gsm-call.lo \
-	gsm-encoding.lo \
-	gsm-common.lo \
-	sms-nokia.lo \
-	nokia-decoding.lo \
-	pkt.lo \
-	compat.lo \
-	misc.lo \
-	snprintf.lo
-
-ifdef NEED_LCHARSET
-OBJS += ../intl/localcharset.lo
-endif
-
-all: $(DIRS) libgnokii.la
-
-libgnokii.la: $(OBJS) phones/libPHONES.la links/libLINKS.la devices/libDEVICES.la
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LIBTOOL_UNDEF) -o libgnokii.la $(OBJS) phones/libPHONES.la links/libLINKS.la devices/libDEVICES.la $(LIBTOOL_VER) $(LIBTOOL_RPATH) $(LDLIBS)
-
-gnvcal.c: vcal.lx
-	$(LEX) -ognvcal.c vcal.lx
-
-$(DIRS):
-	$(MAKE) -C $@
-
-clean:
-	$(MAKE) -C data clean
-	$(MAKE) -C phones clean
-	$(MAKE) -C links clean
-	$(MAKE) -C devices clean
-	$(LIBTOOL) --mode=clean $(RM) libgnokii.la $(OBJS)
-	$(RM) *~ depend
-
-distclean:
-	$(RM) gnvcal.c
-
-install:
-	$(INSTALL) -d $(DESTDIR)$(libdir)
-	$(LIBTOOL) --mode=install $(INSTALL) libgnokii.la $(DESTDIR)$(libdir)
-	@echo "done"
-
-install-devel: install
-	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
-	$(INSTALL_DATA) gnokii.pc $(DESTDIR)$(libdir)/pkgconfig
-	@echo "done"
-
-depend dep:
-	$(CC) $(CFLAGS) -MM *.c >depend
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif
-
-
-.PHONY: all install clean dep depend $(DIRS)
Index: common/Makefile.am
===================================================================
RCS file: common/Makefile.am
diff -N common/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ common/Makefile.am	29 Nov 2007 16:00:10 -0000
@@ -0,0 +1,81 @@
+# REMEMBER: if you change the numbers below, please change them in gnokii.h as well.
+# Change it in the following manner
+#  - if you change the code and don't change API, increase GNOKII_RELEASE
+#  - if you change API in backward compatible manner (adding things),
+#    increase GNOKII_MAJOR, GNOKII_MINOR, set GNOKII_RELEASE to 0
+#  - if you change API in backward incompatible manner (removing things,
+#    changing things), increase GNOKII_MAJOR, set GNOKII_RELEASE to 0
+# Change is just once per release!
+GNOKII_MAJOR = 8
+GNOKII_MINOR = 5
+GNOKII_RELEASE = 0
+
+#if WIN32_CROSS
+#LIBTOOL_UNDEF = -no-undefined
+#LIBTOOL_VER = -version-info $(GNOKII_MAJOR):$(GNOKII_RELEASE):$(GNOKII_MINOR) -avoid-version
+#LIBTOOL_RPATH=-rpath $(libdir)
+#LDLIBS = -lws2_32 -lwinmm
+#else
+LIBTOOL_VER = -version-info $(GNOKII_MAJOR):$(GNOKII_RELEASE):$(GNOKII_MINOR)
+LIBTOOL_RPATH=-rpath $(libdir)
+#endif
+
+if WIN32
+DATA_DIR = 
+else
+DATA_DIR = data
+endif
+
+lib_LTLIBRARIES = libgnokii.la
+
+SUBDIRS = phones \
+	links \
+	devices \
+	$(DATA_DIR)
+
+LIBS   += $(LIBPCSCLITE_LIBS)
+
+pkgconfig_DATA = gnokii.pc
+pkgconfigdir = $(libdir)/pkgconfig
+
+libgnokii_la_CFLAGS = -DLIBDIR="\"$(libdir)\""
+libgnokii_la_SOURCES = \
+	libfunctions.c \
+	gsm-api.c \
+	gsm-error.c \
+	gsm-statemachine.c \
+	cfgreader.c \
+	device.c \
+	vcard.c \
+	vcal.c \
+	gnvcal.c \
+	ldif.c \
+	gsm-networks.c \
+	gsm-filetypes.c \
+	readmidi.c \
+	gsm-ringtones.c \
+	gsm-bitmaps.c \
+	gsm-sms.c \
+	gsm-call.c \
+	gsm-encoding.c \
+	gsm-common.c \
+	sms-nokia.c \
+	nokia-decoding.c \
+	pkt.c \
+	compat.c \
+	misc.c \
+	snprintf.c \
+	localcharset.c \
+	localcharset.h
+
+libgnokii_la_LIBADD = \
+	$(builddir)/phones/libPHONES.la \
+	$(builddir)/links/libLINKS.la \
+	$(builddir)/devices/libDEVICES.la \
+	$(XPM_LIBS)
+
+gnvcal.c: vcal.lx
+	$(LEX) -ognvcal.c vcal.lx
+
+CLEANFILES = gnvcal.c
+
Index: common/localcharset.c
===================================================================
RCS file: common/localcharset.c
diff -N common/localcharset.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ common/localcharset.c	29 Nov 2007 16:00:10 -0000
@@ -0,0 +1,461 @@
+/* Determine a canonical name for the current locale's character encoding.
+
+   Copyright (C) 2000-2006 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
+
+/* Written by Bruno Haible <address@hidden>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "localcharset.h"
+
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#if defined _WIN32 || defined __WIN32__
+# define WIN32_NATIVE
+#endif
+
+#if defined __EMX__
+/* Assume EMX program runs on OS/2, even if compiled under DOS.  */
+# define OS2
+#endif
+
+#if !defined WIN32_NATIVE
+# if HAVE_LANGINFO_CODESET
+#  include <langinfo.h>
+# else
+#  if 0 /* see comment below */
+#   include <locale.h>
+#  endif
+# endif
+# ifdef __CYGWIN__
+#  define WIN32_LEAN_AND_MEAN
+#  include <windows.h>
+# endif
+#elif defined WIN32_NATIVE
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+#endif
+#if defined OS2
+# define INCL_DOS
+# include <os2.h>
+#endif
+
+#if ENABLE_RELOCATABLE
+# include "relocatable.h"
+#else
+# define relocate(pathname) (pathname)
+#endif
+
+/* Get LIBDIR.  */
+#ifndef LIBDIR
+# include "configmake.h"
+#endif
+
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+  /* Win32, Cygwin, OS/2, DOS */
+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+#endif
+
+#ifndef DIRECTORY_SEPARATOR
+# define DIRECTORY_SEPARATOR '/'
+#endif
+
+#ifndef ISSLASH
+# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
+#endif
+
+#if HAVE_DECL_GETC_UNLOCKED
+# undef getc
+# define getc getc_unlocked
+#endif
+
+/* The following static variable is declared 'volatile' to avoid a
+   possible multithread problem in the function get_charset_aliases. If we
+   are running in a threaded environment, and if two threads initialize
+   'charset_aliases' simultaneously, both will produce the same value,
+   and everything will be ok if the two assignments to 'charset_aliases'
+   are atomic. But I don't know what will happen if the two assignments mix.  */
+#if __STDC__ != 1
+# define volatile /* empty */
+#endif
+/* Pointer to the contents of the charset.alias file, if it has already been
+   read, else NULL.  Its format is:
+   ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0'  */
+static const char * volatile charset_aliases;
+
+/* Return a pointer to the contents of the charset.alias file.  */
+static const char *
+get_charset_aliases (void)
+{
+  const char *cp;
+
+  cp = charset_aliases;
+  if (cp == NULL)
+    {
+#if !(defined VMS || defined WIN32_NATIVE || defined __CYGWIN__)
+      FILE *fp;
+      const char *dir;
+      const char *base = "charset.alias";
+      char *file_name;
+
+      /* Make it possible to override the charset.alias location.  This is
+	 necessary for running the testsuite before "make install".  */
+      dir = getenv ("CHARSETALIASDIR");
+      if (dir == NULL || dir[0] == '\0')
+	dir = relocate (LIBDIR);
+
+      /* Concatenate dir and base into freshly allocated file_name.  */
+      {
+	size_t dir_len = strlen (dir);
+	size_t base_len = strlen (base);
+	int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1]));
+	file_name = (char *) malloc (dir_len + add_slash + base_len + 1);
+	if (file_name != NULL)
+	  {
+	    memcpy (file_name, dir, dir_len);
+	    if (add_slash)
+	      file_name[dir_len] = DIRECTORY_SEPARATOR;
+	    memcpy (file_name + dir_len + add_slash, base, base_len + 1);
+	  }
+      }
+
+      if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL)
+	/* Out of memory or file not found, treat it as empty.  */
+	cp = "";
+      else
+	{
+	  /* Parse the file's contents.  */
+	  char *res_ptr = NULL;
+	  size_t res_size = 0;
+
+	  for (;;)
+	    {
+	      int c;
+	      char buf1[50+1];
+	      char buf2[50+1];
+	      size_t l1, l2;
+	      char *old_res_ptr;
+
+	      c = getc (fp);
+	      if (c == EOF)
+		break;
+	      if (c == '\n' || c == ' ' || c == '\t')
+		continue;
+	      if (c == '#')
+		{
+		  /* Skip comment, to end of line.  */
+		  do
+		    c = getc (fp);
+		  while (!(c == EOF || c == '\n'));
+		  if (c == EOF)
+		    break;
+		  continue;
+		}
+	      ungetc (c, fp);
+	      if (fscanf (fp, "%50s %50s", buf1, buf2) < 2)
+		break;
+	      l1 = strlen (buf1);
+	      l2 = strlen (buf2);
+	      old_res_ptr = res_ptr;
+	      if (res_size == 0)
+		{
+		  res_size = l1 + 1 + l2 + 1;
+		  res_ptr = (char *) malloc (res_size + 1);
+		}
+	      else
+		{
+		  res_size += l1 + 1 + l2 + 1;
+		  res_ptr = (char *) realloc (res_ptr, res_size + 1);
+		}
+	      if (res_ptr == NULL)
+		{
+		  /* Out of memory. */
+		  res_size = 0;
+		  if (old_res_ptr != NULL)
+		    free (old_res_ptr);
+		  break;
+		}
+	      strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
+	      strcpy (res_ptr + res_size - (l2 + 1), buf2);
+	    }
+	  fclose (fp);
+	  if (res_size == 0)
+	    cp = "";
+	  else
+	    {
+	      *(res_ptr + res_size) = '\0';
+	      cp = res_ptr;
+	    }
+	}
+
+      if (file_name != NULL)
+	free (file_name);
+
+#else
+
+# if defined VMS
+      /* To avoid the troubles of an extra file charset.alias_vms in the
+	 sources of many GNU packages, simply inline the aliases here.  */
+      /* The list of encodings is taken from the OpenVMS 7.3-1 documentation
+	 "Compaq C Run-Time Library Reference Manual for OpenVMS systems"
+	 section 10.7 "Handling Different Character Sets".  */
+      cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
+	   "ISO8859-2" "\0" "ISO-8859-2" "\0"
+	   "ISO8859-5" "\0" "ISO-8859-5" "\0"
+	   "ISO8859-7" "\0" "ISO-8859-7" "\0"
+	   "ISO8859-8" "\0" "ISO-8859-8" "\0"
+	   "ISO8859-9" "\0" "ISO-8859-9" "\0"
+	   /* Japanese */
+	   "eucJP" "\0" "EUC-JP" "\0"
+	   "SJIS" "\0" "SHIFT_JIS" "\0"
+	   "DECKANJI" "\0" "DEC-KANJI" "\0"
+	   "SDECKANJI" "\0" "EUC-JP" "\0"
+	   /* Chinese */
+	   "eucTW" "\0" "EUC-TW" "\0"
+	   "DECHANYU" "\0" "DEC-HANYU" "\0"
+	   "DECHANZI" "\0" "GB2312" "\0"
+	   /* Korean */
+	   "DECKOREAN" "\0" "EUC-KR" "\0";
+# endif
+
+# if defined WIN32_NATIVE || defined __CYGWIN__
+      /* To avoid the troubles of installing a separate file in the same
+	 directory as the DLL and of retrieving the DLL's directory at
+	 runtime, simply inline the aliases here.  */
+
+      cp = "CP936" "\0" "GBK" "\0"
+	   "CP1361" "\0" "JOHAB" "\0"
+	   "CP20127" "\0" "ASCII" "\0"
+	   "CP20866" "\0" "KOI8-R" "\0"
+	   "CP20936" "\0" "GB2312" "\0"
+	   "CP21866" "\0" "KOI8-RU" "\0"
+	   "CP28591" "\0" "ISO-8859-1" "\0"
+	   "CP28592" "\0" "ISO-8859-2" "\0"
+	   "CP28593" "\0" "ISO-8859-3" "\0"
+	   "CP28594" "\0" "ISO-8859-4" "\0"
+	   "CP28595" "\0" "ISO-8859-5" "\0"
+	   "CP28596" "\0" "ISO-8859-6" "\0"
+	   "CP28597" "\0" "ISO-8859-7" "\0"
+	   "CP28598" "\0" "ISO-8859-8" "\0"
+	   "CP28599" "\0" "ISO-8859-9" "\0"
+	   "CP28605" "\0" "ISO-8859-15" "\0"
+	   "CP38598" "\0" "ISO-8859-8" "\0"
+	   "CP51932" "\0" "EUC-JP" "\0"
+	   "CP51936" "\0" "GB2312" "\0"
+	   "CP51949" "\0" "EUC-KR" "\0"
+	   "CP51950" "\0" "EUC-TW" "\0"
+	   "CP54936" "\0" "GB18030" "\0"
+	   "CP65001" "\0" "UTF-8" "\0";
+# endif
+#endif
+
+      charset_aliases = cp;
+    }
+
+  return cp;
+}
+
+/* Determine the current locale's character encoding, and canonicalize it
+   into one of the canonical names listed in config.charset.
+   The result must not be freed; it is statically allocated.
+   If the canonical name cannot be determined, the result is a non-canonical
+   name.  */
+
+#ifdef STATIC
+STATIC
+#endif
+const char *
+locale_charset (void)
+{
+  const char *codeset;
+  const char *aliases;
+
+#if !(defined WIN32_NATIVE || defined OS2)
+
+# if HAVE_LANGINFO_CODESET
+
+  /* Most systems support nl_langinfo (CODESET) nowadays.  */
+  codeset = nl_langinfo (CODESET);
+
+#  ifdef __CYGWIN__
+  /* Cygwin 2006 does not have locales.  nl_langinfo (CODESET) always
+     returns "US-ASCII".  As long as this is not fixed, return the suffix
+     of the locale name from the environment variables (if present) or
+     the codepage as a number.  */
+  if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0)
+    {
+      const char *locale;
+      static char buf[2 + 10 + 1];
+
+      locale = getenv ("LC_ALL");
+      if (locale == NULL || locale[0] == '\0')
+	{
+	  locale = getenv ("LC_CTYPE");
+	  if (locale == NULL || locale[0] == '\0')
+	    locale = getenv ("LANG");
+	}
+      if (locale != NULL && locale[0] != '\0')
+	{
+	  /* If the locale name contains an encoding after the dot, return
+	     it.  */
+	  const char *dot = strchr (locale, '.');
+
+	  if (dot != NULL)
+	    {
+	      const char *modifier;
+
+	      dot++;
+	      /* Look for the possible @... trailer and remove it, if any.  */
+	      modifier = strchr (dot, '@');
+	      if (modifier == NULL)
+		return dot;
+	      if (modifier - dot < sizeof (buf))
+		{
+		  memcpy (buf, dot, modifier - dot);
+		  buf [modifier - dot] = '\0';
+		  return buf;
+		}
+	    }
+	}
+
+      /* Woe32 has a function returning the locale's codepage as a number.  */
+      sprintf (buf, "CP%u", GetACP ());
+      codeset = buf;
+    }
+#  endif
+
+# else
+
+  /* On old systems which lack it, use setlocale or getenv.  */
+  const char *locale = NULL;
+
+  /* But most old systems don't have a complete set of locales.  Some
+     (like SunOS 4 or DJGPP) have only the C locale.  Therefore we don't
+     use setlocale here; it would return "C" when it doesn't support the
+     locale name the user has set.  */
+#  if 0
+  locale = setlocale (LC_CTYPE, NULL);
+#  endif
+  if (locale == NULL || locale[0] == '\0')
+    {
+      locale = getenv ("LC_ALL");
+      if (locale == NULL || locale[0] == '\0')
+	{
+	  locale = getenv ("LC_CTYPE");
+	  if (locale == NULL || locale[0] == '\0')
+	    locale = getenv ("LANG");
+	}
+    }
+
+  /* On some old systems, one used to set locale = "iso8859_1". On others,
+     you set it to "language_COUNTRY.charset". In any case, we resolve it
+     through the charset.alias file.  */
+  codeset = locale;
+
+# endif
+
+#elif defined WIN32_NATIVE
+
+  static char buf[2 + 10 + 1];
+
+  /* Woe32 has a function returning the locale's codepage as a number.  */
+  sprintf (buf, "CP%u", GetACP ());
+  codeset = buf;
+
+#elif defined OS2
+
+  const char *locale;
+  static char buf[2 + 10 + 1];
+  ULONG cp[3];
+  ULONG cplen;
+
+  /* Allow user to override the codeset, as set in the operating system,
+     with standard language environment variables.  */
+  locale = getenv ("LC_ALL");
+  if (locale == NULL || locale[0] == '\0')
+    {
+      locale = getenv ("LC_CTYPE");
+      if (locale == NULL || locale[0] == '\0')
+	locale = getenv ("LANG");
+    }
+  if (locale != NULL && locale[0] != '\0')
+    {
+      /* If the locale name contains an encoding after the dot, return it.  */
+      const char *dot = strchr (locale, '.');
+
+      if (dot != NULL)
+	{
+	  const char *modifier;
+
+	  dot++;
+	  /* Look for the possible @... trailer and remove it, if any.  */
+	  modifier = strchr (dot, '@');
+	  if (modifier == NULL)
+	    return dot;
+	  if (modifier - dot < sizeof (buf))
+	    {
+	      memcpy (buf, dot, modifier - dot);
+	      buf [modifier - dot] = '\0';
+	      return buf;
+	    }
+	}
+
+      /* Resolve through the charset.alias file.  */
+      codeset = locale;
+    }
+  else
+    {
+      /* OS/2 has a function returning the locale's codepage as a number.  */
+      if (DosQueryCp (sizeof (cp), cp, &cplen))
+	codeset = "";
+      else
+	{
+	  sprintf (buf, "CP%u", cp[0]);
+	  codeset = buf;
+	}
+    }
+
+#endif
+
+  if (codeset == NULL)
+    /* The canonical name cannot be determined.  */
+    codeset = "";
+
+  /* Resolve alias. */
+  for (aliases = get_charset_aliases ();
+       *aliases != '\0';
+       aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
+    if (strcmp (codeset, aliases) == 0
+	|| (aliases[0] == '*' && aliases[1] == '\0'))
+      {
+	codeset = aliases + strlen (aliases) + 1;
+	break;
+      }
+
+  /* Don't return an empty string.  GNU libc and GNU libiconv interpret
+     the empty string as denoting "the locale's character encoding",
+     thus GNU libiconv would call this function a second time.  */
+  if (codeset[0] == '\0')
+    codeset = "ASCII";
+
+  return codeset;
+}
Index: common/localcharset.h
===================================================================
RCS file: common/localcharset.h
diff -N common/localcharset.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ common/localcharset.h	29 Nov 2007 16:00:10 -0000
@@ -0,0 +1,42 @@
+/* Determine a canonical name for the current locale's character encoding.
+   Copyright (C) 2000-2003 Free Software Foundation, Inc.
+   This file is part of the GNU CHARSET Library.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
+
+#ifndef _LOCALCHARSET_H
+#define _LOCALCHARSET_H
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Determine the current locale's character encoding, and canonicalize it
+   into one of the canonical names listed in config.charset.
+   The result must not be freed; it is statically allocated.
+   If the canonical name cannot be determined, the result is a non-canonical
+   name.  */
+extern const char * locale_charset (void);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* _LOCALCHARSET_H */
Index: common/snprintf.c
===================================================================
RCS file: /sources/gnokii/gnokii/common/snprintf.c,v
retrieving revision 1.9
diff -u -p -r1.9 snprintf.c
--- common/snprintf.c	3 Oct 2006 21:29:07 -0000	1.9
+++ common/snprintf.c	29 Nov 2007 16:00:10 -0000
@@ -101,7 +101,7 @@ void dummy_snprintf(void) {} 
 #define LDOUBLE double
 #endif
 
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
 #define LLONG long long
 #else
 #define LLONG long
Index: common/data/.cvsignore
===================================================================
RCS file: /sources/gnokii/gnokii/common/data/.cvsignore,v
retrieving revision 1.1
diff -u -p -r1.1 .cvsignore
--- common/data/.cvsignore	2 May 2006 16:27:06 -0000	1.1
+++ common/data/.cvsignore	29 Nov 2007 16:00:10 -0000
@@ -2,3 +2,5 @@
 *.o
 *.lo
 *.la
+Makefile
+Makefile.in
Index: common/data/Makefile
===================================================================
RCS file: common/data/Makefile
diff -N common/data/Makefile
--- common/data/Makefile	26 Jun 2004 21:57:46 -0000	1.6
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,47 +0,0 @@
-
-#
-# $Id: Makefile,v 1.6 2004/06/26 21:57:46 pkot Exp $
-#
-# Makefile for the GNOKII tool suite.
-#
-# Copyright (C) 1999 Hugh Blemings & Pavel Jan?k ml.
-#               2000 Karel Zak
-#
-
-#
-# For this common directory is used "subsystem.la" .la files concept.
-#   (the list of object files to be linked together (to COMMON.la),
-#   and other dirs is used this _one_ file (instead of all OBJS)
-#
-
-TOPDIR=../..
-include $(TOPDIR)/Makefile.global
-
-OBJS =	at-emulator.lo \
-	datapump.lo \
-	rlp-common.lo \
-	rlp-crc24.lo \
-	virtmodem.lo
-
-all: libDATA.la
-
-libDATA.la: $(OBJS)
-	$(LIBTOOL) --mode=link $(CC) -o libDATA.la $(OBJS)
-
-clean:
-	$(LIBTOOL) --mode=clean $(RM) libDATA.la $(OBJS)
-	$(RM) *~ depend
-
-install:
-	@echo
-
-depend dep:
-	$(CC) $(CFLAGS) -MM *.c >depend
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif
-
-
-.PHONY: all install clean dep depend
-
Index: common/data/Makefile.am
===================================================================
RCS file: common/data/Makefile.am
diff -N common/data/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ common/data/Makefile.am	29 Nov 2007 16:00:11 -0000
@@ -0,0 +1,8 @@
+noinst_LTLIBRARIES = libDATA.la
+libDATA_la_SOURCES = \
+	at-emulator.c \
+	datapump.c \
+	rlp-common.c \
+	rlp-crc24.c \
+	virtmodem.c
+
Index: common/data/virtmodem.c
===================================================================
RCS file: /sources/gnokii/gnokii/common/data/virtmodem.c,v
retrieving revision 1.50
diff -u -p -r1.50 virtmodem.c
--- common/data/virtmodem.c	7 Nov 2007 18:28:19 -0000	1.50
+++ common/data/virtmodem.c	29 Nov 2007 16:00:11 -0000
@@ -22,7 +22,7 @@
   along with gnokii; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-  Copyright (C) 1999-2000  Hugh Blemings & Pavel Jan?k ml.
+  Copyright (C) 1999-2000  Hugh Blemings & Pavel Jan?k ml.
   Copyright (C) 2002       Ladis Michl, Manfred Jonsson, Jan Kratochvil
   Copyright (C) 2001-2004  Pawel Kot
   Copyright (C) 2002-2003  BORBELY Zoltan
@@ -106,7 +106,7 @@ static gn_error VM_GSMInitialise(struct 
 
 /* Global variables */
 
-extern bool GTerminateThread;
+bool GTerminateThread;
 int ConnectCount;
 bool CommandMode;
 
Index: common/devices/.cvsignore
===================================================================
RCS file: /sources/gnokii/gnokii/common/devices/.cvsignore,v
retrieving revision 1.1
diff -u -p -r1.1 .cvsignore
--- common/devices/.cvsignore	2 May 2006 16:27:06 -0000	1.1
+++ common/devices/.cvsignore	29 Nov 2007 16:00:11 -0000
@@ -2,3 +2,5 @@
 *.o
 *.lo
 *.la
+Makefile
+Makefile.in
Index: common/devices/Makefile
===================================================================
RCS file: common/devices/Makefile
diff -N common/devices/Makefile
--- common/devices/Makefile	2 Jan 2007 09:49:30 -0000	1.19
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,58 +0,0 @@
-
-#
-# $Id: Makefile,v 1.19 2007/01/02 09:49:30 pkot Exp $
-#
-# Makefile for the GNOKII tool suite.
-#
-# Copyright (C) 1999 Hugh Blemings & Pavel Jan?k ml.
-#               2000 Karel Zak
-#
-
-#
-# For this common directory is used "subsystem.la" .la files concept.
-#   (the list of object files to be linked together (to COMMON.la),
-#   and other dirs is used this _one_ file (instead of all OBJS)
-#
-
-TOPDIR=../..
-include $(TOPDIR)/Makefile.global
-
-OBJS =	tekram.lo \
-	irda.lo \
-	dku2libusb.lo \
-	bluetooth.lo
-
-ifdef WIN32
-	OBJS += winserial.lo \
-		winirda.lo \
-		winbluetooth.lo
-else
-	OBJS += unixserial.lo \
-		unixbluetooth.lo \
-		osxbluetooth.lo \
-		unixirda.lo \
-		tcp.lo
-endif
-
-all: libDEVICES.la
-
-libDEVICES.la: $(OBJS)
-	$(LIBTOOL) --mode=link $(CC) -o libDEVICES.la $(OBJS)
-
-clean:
-	$(LIBTOOL) --mode=clean $(RM) libDEVICES.la $(OBJS)
-	$(RM) *~ depend
-
-install:
-	@echo
-
-depend dep:
-	$(CC) $(CFLAGS) -MM *.c >depend
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif
-
-
-.PHONY: all install clean dep depend
-
Index: common/devices/Makefile.am
===================================================================
RCS file: common/devices/Makefile.am
diff -N common/devices/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ common/devices/Makefile.am	29 Nov 2007 16:00:11 -0000
@@ -0,0 +1,29 @@
+noinst_LTLIBRARIES = libDEVICES.la
+
+WIN32_FILES = \
+	winserial.c \
+	winirda.c \
+	winbluetooth.c
+
+UNIX_FILES = \
+	unixserial.c \
+	unixbluetooth.c \
+	osxbluetooth.c \
+	unixirda.c \
+	tcp.c
+
+if WIN32
+PLATFORM_FILES = $(WIN32_FILES)
+else
+PLATFORM_FILES = $(UNIX_FILES)
+endif
+
+libDEVICES_la_SOURCES = \
+	$(PLATFORM_FILES) \
+	tekram.c \
+	irda.c \
+	dku2libusb.c \
+	bluetooth.c
+
+EXTRA_DIST = $(WIN32_FILES) $(UNIX_FILES)
+
Index: common/links/.cvsignore
===================================================================
RCS file: /sources/gnokii/gnokii/common/links/.cvsignore,v
retrieving revision 1.1
diff -u -p -r1.1 .cvsignore
--- common/links/.cvsignore	2 May 2006 16:27:06 -0000	1.1
+++ common/links/.cvsignore	29 Nov 2007 16:00:11 -0000
@@ -2,3 +2,5 @@
 *.o
 *.lo
 *.la
+Makefile
+Makefile.in
Index: common/links/Makefile
===================================================================
RCS file: common/links/Makefile
diff -N common/links/Makefile
--- common/links/Makefile	26 Jun 2004 21:57:46 -0000	1.16
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,51 +0,0 @@
-
-#
-# $Id: Makefile,v 1.16 2004/06/26 21:57:46 pkot Exp $
-#
-# Makefile for the GNOKII tool suite.
-#
-# Copyright (C) 1999 Hugh Blemings & Pavel Jan?k ml.
-#               2000 Karel Zak
-#
-
-#
-# For this common directory is used "subsystem.la" .la files concept.
-#   (the list of object files to be linked together (to COMMON.la),
-#   and other dirs is used this _one_ file (instead of all OBJS)
-#
-
-TOPDIR=../..
-include $(TOPDIR)/Makefile.global
-
-OBJS =	atbus.lo \
-	fbus.lo \
-	fbus-phonet.lo \
-	fbus-3110.lo \
-	m2bus.lo \
-	gnbus.lo \
-	utils.lo
-
-#	cbus.lo
-
-all: libLINKS.la
-
-libLINKS.la: $(OBJS)
-	$(LIBTOOL) --mode=link $(CC) -o libLINKS.la $(OBJS)
-
-clean:
-	$(LIBTOOL) --mode=clean $(RM) libLINKS.la $(OBJS)
-	$(RM) *~ depend
-
-install:
-	@echo
-
-depend dep:
-	$(CC) $(CFLAGS) -MM *.c >depend
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif
-
-
-.PHONY: all install clean dep depend
-
Index: common/links/Makefile.am
===================================================================
RCS file: common/links/Makefile.am
diff -N common/links/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ common/links/Makefile.am	29 Nov 2007 16:00:11 -0000
@@ -0,0 +1,10 @@
+noinst_LTLIBRARIES = libLINKS.la
+libLINKS_la_SOURCES = \
+	atbus.c \
+	fbus.c \
+	fbus-phonet.c \
+	fbus-3110.c \
+	m2bus.c \
+	gnbus.c \
+	utils.c
+
Index: common/phones/.cvsignore
===================================================================
RCS file: /sources/gnokii/gnokii/common/phones/.cvsignore,v
retrieving revision 1.1
diff -u -p -r1.1 .cvsignore
--- common/phones/.cvsignore	2 May 2006 16:27:06 -0000	1.1
+++ common/phones/.cvsignore	29 Nov 2007 16:00:11 -0000
@@ -2,3 +2,5 @@
 *.o
 *.lo
 *.la
+Makefile
+Makefile.in
Index: common/phones/Makefile
===================================================================
RCS file: common/phones/Makefile
diff -N common/phones/Makefile
--- common/phones/Makefile	19 Nov 2007 14:51:50 -0000	1.27
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,65 +0,0 @@
-
-#
-# $Id: Makefile,v 1.27 2007/11/19 14:51:50 pkot Exp $
-#
-# Makefile for the GNOKII tool suite.
-#
-# Copyright (C) 1999 Hugh Blemings & Pavel Jan?k ml.
-#               2000 Karel Zak
-#
-
-#
-# For this common directory is used "subsystem.la" .la files concept.
-#   (the list of object files to be linked together (to COMMON.la),
-#   and other dirs is used this _one_ file (instead of all OBJS)
-#
-
-TOPDIR=../..
-include $(TOPDIR)/Makefile.global
-
-CFLAGS += $(LIBPCSCLITE_CFLAGS)
-
-OBJS =	generic.lo \
-	nokia.lo \
-	nk7110.lo \
-	nk6510.lo \
-	nk6160.lo \
-	nk6100.lo \
-	nk3110.lo \
-	atgen.lo \
-	atbosch.lo \
-	ateric.lo \
-	atmot.lo \
-	atnok.lo \
-	atsie.lo \
-	atsoer.lo \
-	atsam.lo \
-	gnapplet.lo \
-	fake.lo \
-	pcsc.lo
-
-#	nk2110.lo
-#	dc2711.lo
-
-all: libPHONES.la
-
-libPHONES.la: $(OBJS)
-	$(LIBTOOL) --mode=link $(CC) -o libPHONES.la $(OBJS)
-
-clean:
-	$(LIBTOOL) --mode=clean $(RM) libPHONES.la $(OBJS)
-	$(RM) *~ depend
-
-install:
-	@echo
-
-depend dep:
-	$(CC) $(CFLAGS) -MM *.c >depend
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif
-
-
-.PHONY: all install clean dep depend
-
Index: common/phones/Makefile.am
===================================================================
RCS file: common/phones/Makefile.am
diff -N common/phones/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ common/phones/Makefile.am	29 Nov 2007 16:00:11 -0000
@@ -0,0 +1,27 @@
+AM_CFLAGS = $(LIBPCSCLITE_CFLAGS)
+
+noinst_LTLIBRARIES = libPHONES.la
+libPHONES_la_SOURCES = \
+	generic.c \
+	nokia.c \
+	nk7110.c \
+	nk6510.c \
+	nk6160.c \
+	nk6100.c \
+	nk3110.c \
+	atgen.c \
+	atbosch.c \
+	ateric.c \
+	atmot.c \
+	atnok.c \
+	atsie.c \
+	atsoer.c \
+	atsam.c \
+	gnapplet.c \
+	fake.c \
+	pcsc.c
+
+#	nk2110.lo
+#	dc2711.lo
+
+
Index: config/.cvsignore
===================================================================
RCS file: /sources/gnokii/gnokii/config/.cvsignore,v
retrieving revision 1.1
diff -u -p -r1.1 .cvsignore
--- config/.cvsignore	2 May 2006 16:39:57 -0000	1.1
+++ config/.cvsignore	29 Nov 2007 16:00:11 -0000
@@ -1,3 +1,2 @@
 config.rpath
 ltmain.sh
-
Index: gnokii/.cvsignore
===================================================================
RCS file: /sources/gnokii/gnokii/gnokii/.cvsignore,v
retrieving revision 1.1
diff -u -p -r1.1 .cvsignore
--- gnokii/.cvsignore	2 May 2006 16:27:06 -0000	1.1
+++ gnokii/.cvsignore	29 Nov 2007 16:00:12 -0000
@@ -3,3 +3,5 @@
 *.lo
 *.la
 gnokii
+Makefile
+Makefile.in
Index: gnokii/Makefile
===================================================================
RCS file: gnokii/Makefile
diff -N gnokii/Makefile
--- gnokii/Makefile	2 Nov 2007 13:40:43 -0000	1.31
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,55 +0,0 @@
-
-#
-# $Id: Makefile,v 1.31 2007/11/02 13:40:43 dforsi Exp $
-#
-# Makefile for the GNOKII tool suite.
-#
-# Copyright (C) 1999 Hugh Blemings & Pavel Jan?k ml.
-#               2000 Karel Zak
-#
-
-TOPDIR=..
-include $(TOPDIR)/Makefile.global
-
-OBJS =	gnokii.o gnokii-calendar.o gnokii-dial.o gnokii-file.o gnokii-logo.o gnokii-monitor.o \
-	gnokii-other.o gnokii-phonebook.o gnokii-profile.o gnokii-ringtone.o gnokii-security.o \
-	gnokii-settings.o gnokii-sms.o gnokii-todo.o gnokii-utils.o gnokii-wap.o
-
-ifdef OWN_GETOPT
-	OBJS += $(TOPDIR)/getopt/libgetopt.a
-endif
-
-ifndef WIN32_CROSS
-PRGNAME=gnokii
-else
-PRGNAME=gnokii.exe
-TARGET=-mconsole
-CFLAGS+=-DGNOKIIDLL_IMPORTS
-endif
-
-LDLIBS += $(TOPDIR)/common/libgnokii.la
-
-all: gnokii
-
-gnokii: $(OBJS) $(TOPDIR)/common/libgnokii.la
-	$(LIBTOOL) --mode=link $(CC) $(TARGET) $(LDFLAGS) $(OBJS) $(LDLIBS) -o $(PRGNAME)
-
-clean:
-	$(LIBTOOL) --mode=clean $(RM) gnokii $(OBJS)
-	$(RM) *~ depend *.exe core *.bak
-ifdef OWN_GETOPT
-	$(MAKE) -C $(TOPDIR)/getopt clean
-endif
-
-install: gnokii
-	$(INSTALL) -d $(DESTDIR)$(bindir)
-	$(LIBTOOL) --mode=install $(INSTALL) $(PRGNAME) $(DESTDIR)$(bindir)
-
-depend dep:
-	$(CC) $(CFLAGS) -MM *.c >depend
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif
-
-.PHONY: all install clean dep depend
Index: gnokii/Makefile.am
===================================================================
RCS file: gnokii/Makefile.am
diff -N gnokii/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnokii/Makefile.am	29 Nov 2007 16:00:13 -0000
@@ -0,0 +1,20 @@
+bin_PROGRAMS = gnokii
+gnokii_SOURCES = gnokii.c gnokii-calendar.c gnokii-dial.c gnokii-file.c gnokii-logo.c gnokii-monitor.c \
+	gnokii-other.c gnokii-phonebook.c gnokii-profile.c gnokii-ringtone.c gnokii-security.c \
+	gnokii-settings.c gnokii-sms.c gnokii-todo.c gnokii-utils.c gnokii-wap.c gnokii-app.h
+
+gnokii_LDADD = $(top_builddir)/common/libgnokii.la
+
+#if OWN_GETOPT
+#	gnokii_LDADD += $(TOPDIR)/getopt/libgetopt.la
+#endif
+
+#FIXME cross compiling
+#if WIN32_CROSS
+#PRGNAME=gnokii.exe
+#TARGET=-mconsole
+#AM_CFLAGS=-DGNOKIIDLL_IMPORTS
+#else
+PRGNAME=gnokii
+#endif
+
Index: gnokiid/.cvsignore
===================================================================
RCS file: /sources/gnokii/gnokii/gnokiid/.cvsignore,v
retrieving revision 1.1
diff -u -p -r1.1 .cvsignore
--- gnokiid/.cvsignore	2 May 2006 16:27:06 -0000	1.1
+++ gnokiid/.cvsignore	29 Nov 2007 16:00:13 -0000
@@ -3,3 +3,5 @@
 *.lo
 *.la
 gnokiid
+Makefile
+Makefile.in
Index: gnokiid/Makefile
===================================================================
RCS file: gnokiid/Makefile
diff -N gnokiid/Makefile
--- gnokiid/Makefile	30 Oct 2007 17:26:15 -0000	1.19
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-
-#
-# Makefile for the GNOKII tool suite.
-#
-# Copyright (C) 1999 Hugh Blemings & Pavel Jan?k ml.
-#               2000 Karel Zak
-#
-
-TOPDIR=..
-include $(TOPDIR)/Makefile.global
-
-LDLIBS += $(TOPDIR)/common/libgnokii.la
-
-OBJS = gnokiid.o
-
-all: gnokiid
-
-gnokiid: $(OBJS) $(TOPDIR)/common/data/libDATA.la $(TOPDIR)/common/libgnokii.la
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(OBJS) $(TOPDIR)/common/data/libDATA.la $(LDLIBS) -o $@
-
-clean:
-	$(LIBTOOL) --mode=clean $(RM) gnokiid $(OBJS)
-	$(RM) *~ depend core *.bak
-
-install: gnokiid
-	$(INSTALL) -d $(DESTDIR)$(sbindir)
-	$(LIBTOOL) --mode=install $(INSTALL) gnokiid $(DESTDIR)$(sbindir)
-
-depend dep:
-	$(CC) $(CFLAGS) -MM *.c >depend
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif
-
-.PHONY: all install clean dep depend
Index: gnokiid/Makefile.am
===================================================================
RCS file: gnokiid/Makefile.am
diff -N gnokiid/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnokiid/Makefile.am	29 Nov 2007 16:00:13 -0000
@@ -0,0 +1,4 @@
+bin_PROGRAMS = gnokiid
+gnokiid_SOURCES = gnokiid.c
+gnokiid_LDADD = $(top_builddir)/common/libgnokii.la $(top_builddir)/common/data/libDATA.la
+
Index: gnokiid/gnokiid.c
===================================================================
RCS file: /sources/gnokii/gnokii/gnokiid/gnokiid.c,v
retrieving revision 1.55
diff -u -p -r1.55 gnokiid.c
--- gnokiid/gnokiid.c	29 May 2007 19:26:40 -0000	1.55
+++ gnokiid/gnokiid.c	29 Nov 2007 16:00:13 -0000
@@ -22,7 +22,7 @@
   along with gnokii; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-  Copyright (C) 1999-2000  Hugh Blemings & Pavel Jan?k ml.
+  Copyright (C) 1999-2000  Hugh Blemings & Pavel Jan?k ml.
   Copyright (C) 2001-2004  Pawel Kot
   Copyright (C) 2002       Manfred Jonsson
   Copyright (C) 2002-2003  BORBELY Zoltan
@@ -55,7 +55,7 @@
 bool DebugMode;		/* When true, run in debug mode */
 const char *BinDir;	/* Directory of the mgnokiidev command */
 char *lockfile = NULL;
-bool GTerminateThread;
+extern bool GTerminateThread;
 
 
 static void short_version()
Index: include/.cvsignore
===================================================================
RCS file: /sources/gnokii/gnokii/include/.cvsignore,v
retrieving revision 1.1
diff -u -p -r1.1 .cvsignore
--- include/.cvsignore	2 May 2006 16:46:01 -0000	1.1
+++ include/.cvsignore	29 Nov 2007 16:00:13 -0000
@@ -1,3 +1,4 @@
 config.h
 config.h.in
-
+Makefile
+Makefile.in
Index: include/Makefile
===================================================================
RCS file: include/Makefile
diff -N include/Makefile
--- include/Makefile	11 Nov 2007 19:47:24 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,47 +0,0 @@
-#
-# Makefile for the GNOKII tool includes directory
-#
-# Copyright (C) 2003 Pawe? Kot
-#
-
-TOPDIR=../
-include ${TOPDIR}/Makefile.global
-
-#
-# Header files to be installed
-#
-
-INSTALL_HEADERS = gnokii.h \
-		gnokii/bitmaps.h \
-		gnokii/common.h \
-		gnokii/data.h \
-		gnokii/error.h \
-		gnokii/ringtones.h \
-		gnokii/sms.h \
-		gnokii/virtmodem.h \
-		gnokii/call.h \
-		gnokii/encoding.h \
-		gnokii/networks.h \
-		gnokii/rlp-common.h \
-		gnokii/statemachine.h \
-		gnokii/wappush.h
-
-all:
-	@echo
-
-install-devel:
-	$(INSTALL) -d $(DESTDIR)$(includedir)/gnokii
-	@for xxx in $(INSTALL_HEADERS); do \
-	    if [ -e $$xxx ]; then \
-		$(INSTALL) -m 0644 $$xxx $(DESTDIR)$(includedir)/$$xxx; \
-	    fi; \
-        done
-	@echo "done"
-
-clean:
-	@echo
-
-depend dep:
-	@echo
-
-.PHONY: all install clean dep depend
Index: include/Makefile.am
===================================================================
RCS file: include/Makefile.am
diff -N include/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/Makefile.am	29 Nov 2007 16:00:13 -0000
@@ -0,0 +1,19 @@
+SUBDIRS = data devices gnokii links phones win32
+
+gnokiidir = $(includedir)
+gnokii_HEADERS = gnokii.h
+
+EXTRA_HEADERS = \
+		 cfgreader.h \
+		 compat.h \
+		 config.h \
+		 device.h \
+		 gnokii.h \
+		 gnokii-internal.h \
+		 gsm-filetypes.h \
+		 misc.h \
+		 nokia-decoding.h \
+		 pkt.h \
+		 sms-nokia.h
+
+
Index: include/data/.cvsignore
===================================================================
RCS file: include/data/.cvsignore
diff -N include/data/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/data/.cvsignore	29 Nov 2007 16:00:13 -0000
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
Index: include/data/Makefile.am
===================================================================
RCS file: include/data/Makefile.am
diff -N include/data/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/data/Makefile.am	29 Nov 2007 16:00:13 -0000
@@ -0,0 +1,6 @@
+
+EXTRA_HEADERS = \
+		at-emulator.h \
+		datapump.h \
+		rlp-crc24.h
+
Index: include/devices/.cvsignore
===================================================================
RCS file: include/devices/.cvsignore
diff -N include/devices/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/devices/.cvsignore	29 Nov 2007 16:00:13 -0000
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
Index: include/devices/Makefile.am
===================================================================
RCS file: include/devices/Makefile.am
diff -N include/devices/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/devices/Makefile.am	29 Nov 2007 16:00:13 -0000
@@ -0,0 +1,13 @@
+
+EXTRA_HEADERS = \
+		dku2libusb.h \
+		irda.h \
+		linuxirda.h \
+		osxbluetooth.h \
+		tcp.h \
+		tekram.h \
+		unixbluetooth.h \
+		unixirda.h \
+		unixserial.h \
+		winserial.h
+
Index: include/gnokii/.cvsignore
===================================================================
RCS file: include/gnokii/.cvsignore
diff -N include/gnokii/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/gnokii/.cvsignore	29 Nov 2007 16:00:13 -0000
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
Index: include/gnokii/Makefile.am
===================================================================
RCS file: include/gnokii/Makefile.am
diff -N include/gnokii/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/gnokii/Makefile.am	29 Nov 2007 16:00:13 -0000
@@ -0,0 +1,17 @@
+
+gnokiisubdir = $(includedir)/gnokii
+gnokiisub_HEADERS = \
+		bitmaps.h \
+		call.h \
+		common.h \
+		data.h \
+		encoding.h \
+		error.h \
+		networks.h \
+		ringtones.h \
+		rlp-common.h \
+		sms.h \
+		statemachine.h \
+		virtmodem.h \
+		wappush.h
+
Index: include/links/.cvsignore
===================================================================
RCS file: include/links/.cvsignore
diff -N include/links/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/links/.cvsignore	29 Nov 2007 16:00:13 -0000
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
Index: include/links/Makefile.am
===================================================================
RCS file: include/links/Makefile.am
diff -N include/links/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/links/Makefile.am	29 Nov 2007 16:00:13 -0000
@@ -0,0 +1,12 @@
+
+EXTRA_HEADERS = \
+		atbus.h \
+		cbus.h \
+		fbus-3110.h \
+		fbus-common.h \
+		fbus.h \
+		fbus-phonet.h \
+		gnbus.h \
+		m2bus.h \
+		utils.h
+
Index: include/phones/.cvsignore
===================================================================
RCS file: include/phones/.cvsignore
diff -N include/phones/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/phones/.cvsignore	29 Nov 2007 16:00:13 -0000
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
Index: include/phones/Makefile.am
===================================================================
RCS file: include/phones/Makefile.am
diff -N include/phones/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/phones/Makefile.am	29 Nov 2007 16:00:13 -0000
@@ -0,0 +1,21 @@
+
+EXTRA_HEADERS = \
+		atbosch.h \
+		ateric.h \
+		atgen.h \
+		atmot.h \
+		atnok.h \
+		atsam.h \
+		atsie.h \
+		atsoer.h \
+		dc2711.h \
+		generic.h \
+		gnapplet.h \
+		nk2110.h \
+		nk3110.h \
+		nk6100.h \
+		nk6510.h \
+		nk7110.h \
+		nokia.h \
+		pcsc.h
+
Index: include/win32/.cvsignore
===================================================================
RCS file: include/win32/.cvsignore
diff -N include/win32/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/win32/.cvsignore	29 Nov 2007 16:00:13 -0000
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
Index: include/win32/Makefile.am
===================================================================
RCS file: include/win32/Makefile.am
diff -N include/win32/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/win32/Makefile.am	29 Nov 2007 16:00:13 -0000
@@ -0,0 +1,5 @@
+
+EXTRA_HEADERS = \
+		getopt.h \
+		winserial.h
+
Index: po/.cvsignore
===================================================================
RCS file: /sources/gnokii/gnokii/po/.cvsignore,v
retrieving revision 1.1
diff -u -p -r1.1 .cvsignore
--- po/.cvsignore	2 May 2006 16:31:50 -0000	1.1
+++ po/.cvsignore	29 Nov 2007 16:00:14 -0000
@@ -10,4 +10,5 @@ POTFILES
 Rules-quot
 gnokii.pot
 stamp-po
-
+Makefile
+Makefile.in
Index: po/LINGUAS
===================================================================
RCS file: po/LINGUAS
diff -N po/LINGUAS
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ po/LINGUAS	29 Nov 2007 16:00:14 -0000
@@ -0,0 +1,13 @@
+cs
+de
+et
+fi
+nl
+sk
+pl
+it
+sl
+fr
+zh_CN
+sv
+pt
Index: smsd/.cvsignore
===================================================================
RCS file: /sources/gnokii/gnokii/smsd/.cvsignore,v
retrieving revision 1.1
diff -u -p -r1.1 .cvsignore
--- smsd/.cvsignore	2 May 2006 16:27:06 -0000	1.1
+++ smsd/.cvsignore	29 Nov 2007 16:00:44 -0000
@@ -3,3 +3,5 @@
 *.lo
 *.la
 smsd
+Makefile
+Makefile.in
Index: smsd/smsd.c
===================================================================
RCS file: /sources/gnokii/gnokii/smsd/smsd.c,v
retrieving revision 1.57
diff -u -p -r1.57 smsd.c
--- smsd/smsd.c	7 Jul 2007 14:33:04 -0000	1.57
+++ smsd/smsd.c	29 Nov 2007 16:00:44 -0000
@@ -22,7 +22,7 @@
   along with gnokii; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-  Copyright (C) 1999 Pavel Jan?k ml., Hugh Blemings
+  Copyright (C) 1999 Pavel Jan?k ml., Hugh Blemings
   Copyright (C) 1999-2005 Jan Derfinak
 
 */
@@ -67,7 +67,7 @@
 SmsdConfig smsdConfig;
 
 /* Global variables */
-bool GTerminateThread;
+extern bool GTerminateThread = false;
 
 /* Local variables */
 static DBConfig connection;
Index: utils/.cvsignore
===================================================================
RCS file: /sources/gnokii/gnokii/utils/.cvsignore,v
retrieving revision 1.3
diff -u -p -r1.3 .cvsignore
--- utils/.cvsignore	7 May 2007 15:28:01 -0000	1.3
+++ utils/.cvsignore	29 Nov 2007 16:00:44 -0000
@@ -1,4 +1,5 @@
 .libs
 mgnokiidev
 *.lo
-
+Makefile
+Makefile.in
Index: utils/Makefile
===================================================================
RCS file: utils/Makefile
diff -N utils/Makefile
--- utils/Makefile	12 Oct 2007 13:28:24 -0000	1.18
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,44 +0,0 @@
-
-#
-# Makefile for the GNOKII tool suite.
-#
-# Copyright (C) 1999 Hugh Blemings & Pavel Jan?k ml.
-#               2000 Karel Zak
-#
-
-TOPDIR=..
-include $(TOPDIR)/Makefile.global
-
-OBJS = mgnokiidev.lo
-
-all: mgnokiidev
-
-mgnokiidev: $(OBJS)
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(OBJS) $(LDLIBS) -o $@
-
-clean:
-	$(LIBTOOL) --mode=clean $(RM) mgnokiidev $(OBJS)
-	$(RM) *~ depend *.exe core *.bak
-
-install-generic:
-	$(INSTALL) -d $(DESTDIR)$(sbindir)
-	$(INSTALL) -d $(DESTDIR)$(bindir)
-	$(INSTALL) -m 755 sendsms $(DESTDIR)$(bindir)
-	@if [ -f gnapplet.sis ]; then \
-		$(INSTALL) -d $(DESTDIR)$(docdir); \
-		$(INSTALL_DATA) gnapplet.sis $(DESTDIR)$(docdir); \
-	fi
-
-install: install-generic
-	$(LIBTOOL) --mode=install $(INSTALL) mgnokiidev $(DESTDIR)$(sbindir)
-
-depend dep:
-	$(CC) $(CFLAGS) -MM *.c >depend
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif
-
-
-.PHONY: all install clean dep depend
-
Index: utils/Makefile.am
===================================================================
RCS file: utils/Makefile.am
diff -N utils/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ utils/Makefile.am	29 Nov 2007 16:00:44 -0000
@@ -0,0 +1,6 @@
+bin_PROGRAMS = mgnokiidev
+mgnokiidev_SOURCES = mgnokiidev.c
+
+scripts_DATA = sendsms
+scriptsdir = $(bindir)
+
Index: xgnokii/.cvsignore
===================================================================
RCS file: /sources/gnokii/gnokii/xgnokii/.cvsignore,v
retrieving revision 1.2
diff -u -p -r1.2 .cvsignore
--- xgnokii/.cvsignore	2 May 2006 16:39:57 -0000	1.2
+++ xgnokii/.cvsignore	29 Nov 2007 16:00:44 -0000
@@ -4,3 +4,5 @@
 *.la
 xgnokii
 xgnokii.pc
+Makefile
+Makefile.in
Index: xgnokii/Makefile
===================================================================
RCS file: xgnokii/Makefile
diff -N xgnokii/Makefile
--- xgnokii/Makefile	13 Nov 2007 20:25:22 -0000	1.62
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,81 +0,0 @@
-
-
-#
-# $Id: Makefile,v 1.62 2007/11/13 20:25:22 pkot Exp $
-#
-# Makefile for the xGNOKII tool suite.
-#
-# Copyright (C) 1999 Hugh Blemings & Pavel Jan?k ml. & Jan Derfinak
-#               2000 Karel Zak
-#
-
-TOPDIR=..
-include $(TOPDIR)/Makefile.global
-
-CFLAGS += $(PTHREAD_CFLAGS) \
-	  $(GTK_CFLAGS) -DGTK_ENABLE_BROKEN
-
-LDLIBS += $(PTHREAD_LIBS) \
-	  $(GTK_LIBS)
-
-GLDLIBS += $(TOPDIR)/common/libgnokii.la
-
-OBJS = 	xgnokii.lo \
-	xgnokii_common.lo \
-	xgnokii_contacts.lo \
-	xgnokii_sms.lo \
-	xgnokii_netmon.lo \
-	xgnokii_dtmf.lo \
-	xgnokii_cfg.lo \
-	xgnokii_speed.lo \
-	xgnokii_xkeyb.lo \
-	xgnokii_calendar.lo \
-	xgnokii_logos.lo \
-	xgnokii_xring.lo \
-	xgnokii_lowlevel.lo \
-	xgnokii_data.lo
-
-HELP_DIR = docs/help
-
-all: xgnokii
-
-
-xgnokii: $(OBJS) $(TOPDIR)/common/data/libDATA.la $(TOPDIR)/common/libgnokii.la
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(OBJS) $(GLDLIBS) $(TOPDIR)/common/data/libDATA.la $(LDLIBS) -o $@
-
-clean:
-	$(LIBTOOL) --mode=clean $(RM) xgnokii $(OBJS)
-	$(RM) *~ xpm/*~ depend
-
-install: xgnokii
-	$(LIBTOOL) --mode=install $(INSTALL) xgnokii $(DESTDIR)$(xbindir)
-	$(INSTALL) -d $(DESTDIR)$(xgnokii_libdir)/help
-	( cd $(HELP_DIR); \
-	  $(FIND) . -type d \! -path "*CVS*" \
-	       -exec $(INSTALL) -d $(DESTDIR)$(xgnokii_libdir)/help/{} \; ; \
-	  $(FIND) . -type f \! -path "*CVS*" \
-	       -exec $(INSTALL_DATA) {} $(DESTDIR)$(xgnokii_libdir)/help/{} \; \
-	)
-	$(INSTALL_DATA) ../Docs/CREDITS $(DESTDIR)$(xgnokii_libdir)/help/en_US
-	$(INSTALL_DATA) ../COPYING $(DESTDIR)$(xgnokii_libdir)/help/en_US
-	$(INSTALL) -d $(DESTDIR)$(xgnokii_libdir)/help/en_US/sample
-	$(INSTALL_DATA) ../Docs/sample/gnokiirc $(DESTDIR)$(xgnokii_libdir)/help/en_US/sample
-	(cd $(DESTDIR)$(xgnokii_libdir)/help; \
-	$(RM) C ; ln -sf en_US C; \
-	$(RM) POSIX ; ln -sf en_US POSIX)
-	$(INSTALL) -d $(DESTDIR)$(datadir)/applications
-	$(INSTALL_DATA) xgnokii.desktop $(DESTDIR)$(datadir)/applications
-
-install-devel:
-	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
-	$(INSTALL_DATA) xgnokii.pc $(DESTDIR)$(libdir)/pkgconfig
-
-depend dep:
-	$(CC) $(CFLAGS) -MM *.c >depend
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif
-
-
-.PHONY: all install clean dep depend
Index: xgnokii/Makefile.am
===================================================================
RCS file: xgnokii/Makefile.am
diff -N xgnokii/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xgnokii/Makefile.am	29 Nov 2007 16:00:44 -0000
@@ -0,0 +1,42 @@
+bin_PROGRAMS = xgnokii
+
+AM_CFLAGS = $(PTHREAD_CFLAGS) \
+	  $(GTK_CFLAGS) -DGTK_ENABLE_BROKEN
+
+xgnokii_LDADD = $(PTHREAD_LIBS) $(GTK_LIBS) $(top_builddir)/common/libgnokii.la $(top_builddir)/common/data/libDATA.la
+
+xgnokii_SOURCES = \
+	xgnokii.c \
+	xgnokii_common.c \
+	xgnokii_contacts.c \
+	xgnokii_sms.c \
+	xgnokii_netmon.c \
+	xgnokii_dtmf.c \
+	xgnokii_cfg.c \
+	xgnokii_speed.c \
+	xgnokii_xkeyb.c \
+	xgnokii_calendar.c \
+	xgnokii_logos.c \
+	xgnokii_xring.c \
+	xgnokii_lowlevel.c \
+	xgnokii_data.c \
+	xgnokii_calendar.h \
+	xgnokii_cfg.h \
+	xgnokii_common.h \
+	xgnokii_contacts.h \
+	xgnokii_data.h \
+	xgnokii_dtmf.h \
+	xgnokii.h \
+	xgnokii_logos.h \
+	xgnokii_lowlevel.h \
+	xgnokii_netmon.h \
+	xgnokii_sms.h \
+	xgnokii_speed.h \
+	xgnokii_xkeyb.h \
+	xgnokii_xring.h
+
+#FIXME install help
+HELP_DIR = docs/help
+
+pkgconfig_DATA = xgnokii.pc
+pkgconfigdir = $(libdir)/pkgconfig
Index: xgnokii/xgnokii_data.c
===================================================================
RCS file: /sources/gnokii/gnokii/xgnokii/xgnokii_data.c,v
retrieving revision 1.15
diff -u -p -r1.15 xgnokii_data.c
--- xgnokii/xgnokii_data.c	15 Aug 2006 10:57:20 -0000	1.15
+++ xgnokii/xgnokii_data.c	29 Nov 2007 16:00:45 -0000
@@ -22,7 +22,7 @@
   along with gnokii; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-  Copyright (C) 1999 Pavel Jan?k ml., Hugh Blemings
+  Copyright (C) 1999 Pavel Jan?k ml., Hugh Blemings
   & 1999-2005 Jan Derfinak.
   Copyright (C) 2002-2004 Pawel Kot
   Copyright (C) 2002      BORBELY Zoltan
@@ -38,7 +38,7 @@
 #include "xgnokii_data.h"
 
 static GtkWidget *GUI_DataWindow;
-bool GTerminateThread = false;
+extern bool GTerminateThread;
 bool enabled = false;
 static GtkWidget *label = NULL;