.gitmodules

diff --git a/.gitmodules b/.gitmodules

index 4fce771..5b98c56 100644

--- a/.gitmodules

+++ b/.gitmodules

@@ -1,6 +1,3 @@

-[submodule "admin"]

-	path = admin

-	url = http://system@.../scm/git/tde-common-admin

 [submodule "cmake"]

 	path = cmake

 	url = http://system@.../scm/git/tde-common-cmake

INSTALL

diff --git a/INSTALL b/INSTALL

index 02a4a07..0ab59aa 100644

--- a/INSTALL

+++ b/INSTALL

@@ -1,6 +1,25 @@

 Basic Installation

 ==================

+Kbarcode relies on cmake to build.

+

+Here are suggested default options:

+

+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \

+ -DCONFIG_INSTALL_DIR="/etc/trinity" \

+ -DSYSCONF_INSTALL_DIR="/etc" \

+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \

+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \

+ -DCMAKE_VERBOSE_MAKEFILE="ON" \

+ -DCMAKE_SKIP_RPATH="OFF" \

+ -DBUILD_ALL="ON" \

+ -DWITH_ALL_OPTIONS="ON"

+

+

+

+

+##### the following instructions, kept as a reference, are basically obsolete - October 04 2019 #####

+

    These are generic installation instructions.

    The `configure' shell script attempts to guess correct values for

Makefile.am

diff --git a/Makefile.am b/Makefile.am

deleted file mode 100644

index b561a94..0000000

--- a/Makefile.am

+++ /dev/null

@@ -1,26 +0,0 @@

-SUBDIRS = doc kbarcode fileplugin po

-

-$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs

-	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;

-

-$(top_srcdir)/subdirs:

-	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs

-

-$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in

-	@cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4

-

-MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files 

-

-package-messages:

-	$(MAKE) -f admin/Makefile.common package-messages

-	$(MAKE) -C po merge

-

-EXTRA_DIST = admin COPYING configure.in.in

-

-dist-hook:

-	cd $(top_distdir) && perl admin/am_edit -padmin

-	cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs

-noinst_DATA = kbarcode.spec acinclude.m4 aclocal.m4 AUTHORS ChangeLog \

-	config.h.in configure configure.in configure.in.in COPYING Doxyfile INSTALL \

-	libtool Makefile.am Makefile.cvs Makefile.in NEWS README stamp-h.in \

-	subdirs

Makefile.cvs

diff --git a/Makefile.cvs b/Makefile.cvs

deleted file mode 100644

index 4c0afd1..0000000

--- a/Makefile.cvs

+++ /dev/null

@@ -1,10 +0,0 @@

-all: 

-	@echo "This Makefile is only for the CVS repository"

-	@echo "This will be deleted before making the distribution"

-	@echo ""

-	$(MAKE) -f admin/Makefile.common cvs

-

-dist:

-	$(MAKE) -f admin/Makefile.common dist

-

-.SILENT:

NEWS

diff --git a/NEWS b/NEWS

deleted file mode 100644

index 0519ecb..0000000

--- a/NEWS

+++ /dev/null

@@ -1 +0,0 @@

- 

\ No newline at end of file

README

diff --git a/README b/README

index 0e05c15..245b013 100644

--- a/README

+++ b/README

@@ -1,27 +1,19 @@

 kBarcode

-General Information:

-Project Webpage:    http://www.kbarcode.net

-Core Members:       Stonki <support@...>

-                    Dom <domseichter@...>

-Mailinglist:        kbarcode-users@...

-IRC Channel:        irc.openprojects.net #kbarcode

-

-

-Project Description:

-====================

-KBarcode is a barcode and label printing application for Linux and KDE 3. It can

+KBarcode is a barcode and label printing application. It can

 be used to print every thing from simple business cards up to complex

 labels with several barcodes (e.g. article descriptions). KBarcode

 comes with an easy to use WYSIWYG label designer, a setup wizard,

 batch import of labels (directly from the delivery note), thousands

 of predefined labels, database managment tools and translations

 in many languages. Even printing more than 10.000 labels in one go is

-no problem for KBarcode. Additionally it is a simply xbarcode

-replacement for the creation of barcodes. All major types of barcodes

-like EAN, UPC, CODE39, DataMatrix and ISBN are supported.

+no problem for KBarcode.

-It works of course on any platform supported by KDE and not only Linux!

+Additionally it is a simply xbarcode replacement for the creation of

+barcodes. All major types of barcodeslike EAN, UPC, CODE39, DataMatrix

+and ISBN are supported.

+

+It works of course on any platform supported by TDE.

 Languages:

 * English

@@ -34,26 +26,7 @@

 * Swedish

 Requirements:

-* KDE 3.x

 * GnuBarcode (RunTime)

 * TBarcode(RunTime)

 * ImageMackick (RunTime)

 * Qt SQL Tools (optional)

-

-Germany, 05. June 2002

-    (updated 31.10.2002)

-    (updated 02.02.2003)

-    (updated 22.10.2003)    

-

-Compiling KBarcode from CVS:

-============================

-

-To compile KBarcode from CVS you have to use the following commands:

-

-make -f admin/Makefile.common

-./configure

-make

-su

-make install

-

-Be sure to use the first step which will create the configure script for you.

acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4

deleted file mode 100644

index 143360d..0000000

--- a/acinclude.m4

+++ /dev/null

@@ -1,11834 +0,0 @@

-##   -*- autoconf -*-

-

-dnl    This file is part of the KDE libraries/packages

-dnl    Copyright (C) 1997 Janos Farkas (chexum@...)

-dnl              (C) 1997,98,99 Stephan Kulow (coolo@...)

-

-dnl    This file is free software; you can redistribute it and/or

-dnl    modify it under the terms of the GNU Library General Public

-dnl    License as published by the Free Software Foundation; either

-dnl    version 2 of the License, or (at your option) any later version.

-

-dnl    This library is distributed in the hope that it will be useful,

-dnl    but WITHOUT ANY WARRANTY; without even the implied warranty of

-dnl    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

-dnl    Library General Public License for more details.

-

-dnl    You should have received a copy of the GNU Library General Public License

-dnl    along with this library; see the file COPYING.LIB.  If not, write to

-dnl    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

-dnl    Boston, MA 02110-1301, USA.

-

-dnl IMPORTANT NOTE:

-dnl Please do not modify this file unless you expect your modifications to be

-dnl carried into every other module in the repository. 

-dnl

-dnl Single-module modifications are best placed in configure.in for tdelibs

-dnl and tdebase or configure.in.in if present.

-

-# KDE_PATH_X_DIRECT

-dnl Internal subroutine of AC_PATH_X.

-dnl Set ac_x_includes and/or ac_x_libraries.

-AC_DEFUN([KDE_PATH_X_DIRECT],

-[

-AC_REQUIRE([KDE_CHECK_LIB64])

-

-if test "$ac_x_includes" = NO; then

-  # Guess where to find include files, by looking for this one X11 .h file.

-  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h

-

-  # First, try using that file with no special directory specified.

-AC_TRY_CPP([#include <$x_direct_test_include>],

-[# We can compile using X headers with no special include directory.

-ac_x_includes=],

-[# Look for the header file in a standard set of common directories.

-# Check X11 before X11Rn because it is often a symlink to the current release.

-  for ac_dir in               \

-    /usr/X11/include          \

-    /usr/X11R6/include        \

-    /usr/X11R5/include        \

-    /usr/X11R4/include        \

-                              \

-    /usr/include/X11          \

-    /usr/include/X11R6        \

-    /usr/include/X11R5        \

-    /usr/include/X11R4        \

-                              \

-    /usr/local/X11/include    \

-    /usr/local/X11R6/include  \

-    /usr/local/X11R5/include  \

-    /usr/local/X11R4/include  \

-                              \

-    /usr/local/include/X11    \

-    /usr/local/include/X11R6  \

-    /usr/local/include/X11R5  \

-    /usr/local/include/X11R4  \

-                              \

-    /usr/X386/include         \

-    /usr/x386/include         \

-    /usr/XFree86/include/X11  \

-                              \

-    /usr/include              \

-    /usr/local/include        \

-    /usr/unsupported/include  \

-    /usr/athena/include       \

-    /usr/local/x11r5/include  \

-    /usr/lpp/Xamples/include  \

-                              \

-    /usr/openwin/include      \

-    /usr/openwin/share/include \

-    ; \

-  do

** Diff limit reached (max: 250 lines) **