[kbookreader][master,r14.0.x] fb06c8d3,e0a2875a

.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..82f4ec4 100644

--- a/INSTALL

+++ b/INSTALL

@@ -1,6 +1,27 @@

 Basic Installation

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

+Kbookreader relies on cmake to build.

+Here are suggested default options:

+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \

+ -DCONFIG_INSTALL_DIR="/etc/trinity" \

+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \

+ -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 08 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 8a2284f..0000000

--- a/Makefile.am

+++ /dev/null

@@ -1,22 +0,0 @@

-SUBDIRS = $(TOPSUBDIRS)

-$(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:

-	cd $(top_srcdir) && $(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

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 e69de29..0000000

--- a/NEWS

+++ /dev/null

README

diff --git a/README b/README

index e69de29..6ae4929 100644

--- a/README

+++ b/README

@@ -0,0 +1,5 @@

+kbookreader - eBook reader for TDE.

+KBookReader is a TDE twin-panel text files viewer specialized in reading

+e-books.It supports multiple bookmarks, custom fonts, encoding selection.

acinclude.m4

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

deleted file mode 100644

index d762ab1..0000000

--- a/acinclude.m4

+++ /dev/null

@@ -1,11179 +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., 59 Temple Place - Suite 330,

-dnl    Boston, MA 02111-1307, 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

-    if test -r "$ac_dir/$x_direct_test_include"; then

-      ac_x_includes=$ac_dir

-      break

-    fi

-  done])

-fi # $ac_x_includes = NO

-if test "$ac_x_libraries" = NO; then

-  # Check for the libraries.

-  test -z "$x_direct_test_library" && x_direct_test_library=Xt

-  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc

-  # See if we find them without any special options.

-  # Don't add to $LIBS permanently.

-  ac_save_LIBS="$LIBS"

-  LIBS="-l$x_direct_test_library $LIBS"

-AC_TRY_LINK(, [${x_direct_test_function}()],

-[LIBS="$ac_save_LIBS"

-# We can link X programs with no special library path.

-ac_x_libraries=],

-[LIBS="$ac_save_LIBS"

-# First see if replacing the include by lib works.

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

-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \

-    /usr/X11/lib${tdelibsuff}           \

-    /usr/X11R6/lib${tdelibsuff}         \

-    /usr/X11R5/lib${tdelibsuff}         \

-    /usr/X11R4/lib${tdelibsuff}         \

-                                        \

-    /usr/lib${tdelibsuff}/X11           \

-    /usr/lib${tdelibsuff}/X11R6         \

-    /usr/lib${tdelibsuff}/X11R5         \

-    /usr/lib${tdelibsuff}/X11R4         \

-                                        \

-    /usr/local/X11/lib${tdelibsuff}     \

-    /usr/local/X11R6/lib${tdelibsuff}   \

-    /usr/local/X11R5/lib${tdelibsuff}   \

-    /usr/local/X11R4/lib${tdelibsuff}   \

-                                        \

-    /usr/local/lib${tdelibsuff}/X11     \

-    /usr/local/lib${tdelibsuff}/X11R6   \

-    /usr/local/lib${tdelibsuff}/X11R5   \

-    /usr/local/lib${tdelibsuff}/X11R4   \

-                                        \

-    /usr/X386/lib${tdelibsuff}          \

-    /usr/x386/lib${tdelibsuff}          \

-    /usr/XFree86/lib${tdelibsuff}/X11   \

-                                        \

-    /usr/lib${tdelibsuff}               \

-    /usr/local/lib${tdelibsuff}         \

-    /usr/unsupported/lib${tdelibsuff}   \

-    /usr/athena/lib${tdelibsuff}        \

-    /usr/local/x11r5/lib${tdelibsuff}   \

-    /usr/lpp/Xamples/lib${tdelibsuff}   \

-    /lib/usr/lib${tdelibsuff}/X11       \

-                                        \

-    /usr/openwin/lib${tdelibsuff}       \

-    /usr/openwin/share/lib${tdelibsuff} \

-    ; \

-do

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

fb06c8d3	2019-10-09 15:52:02	gregory guy
Drop automake build support. Add basic cmake build instructions. Add description in README. Deleted empty files: NEWS, templates/cpp, templates/h. Deleted obsolete file: bookreader.spec . Signed-off-by: gregory guy <gregory-tde@...>
M .gitmodules M INSTALL M README R Makefile.am R Makefile.cvs R NEWS R acinclude.m4 R aclocal.m4 R admin R bookreader.spec R config.h.in R configure.files R configure.in R configure.in.in R doc/Makefile.am R doc/en/Makefile.am R images/Makefile.am R po/Makefile.am R src/Makefile.am R stamp-h.in R subdirs R templates/cpp R templates/h
.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..82f4ec4 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,27 @@ Basic Installation ================== +Kbookreader relies on cmake to build. + +Here are suggested default options: + + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -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 08 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 8a2284f..0000000 --- a/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -SUBDIRS = $(TOPSUBDIRS) - -$(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: - cd $(top_srcdir) && $(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 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 e69de29..0000000 --- a/NEWS +++ /dev/null README diff --git a/README b/README index e69de29..6ae4929 100644 --- a/README +++ b/README @@ -0,0 +1,5 @@ +kbookreader - eBook reader for TDE. + + +KBookReader is a TDE twin-panel text files viewer specialized in reading +e-books.It supports multiple bookmarks, custom fonts, encoding selection. acinclude.m4 diff --git a/acinclude.m4 b/acinclude.m4 deleted file mode 100644 index d762ab1..0000000 --- a/acinclude.m4 +++ /dev/null @@ -1,11179 +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., 59 Temple Place - Suite 330, -dnl Boston, MA 02111-1307, 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 - if test -r "$ac_dir/$x_direct_test_include"; then - ac_x_includes=$ac_dir - break - fi - done]) -fi # $ac_x_includes = NO - -if test "$ac_x_libraries" = NO; then - # Check for the libraries. - - test -z "$x_direct_test_library" && x_direct_test_library=Xt - test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc - - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS="$LIBS" - LIBS="-l$x_direct_test_library $LIBS" -AC_TRY_LINK(, [${x_direct_test_function}()], -[LIBS="$ac_save_LIBS" -# We can link X programs with no special library path. -ac_x_libraries=], -[LIBS="$ac_save_LIBS" -# First see if replacing the include by lib works. -# Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" \| sed s/include/lib${tdelibsuff}/` \ - /usr/X11/lib${tdelibsuff} \ - /usr/X11R6/lib${tdelibsuff} \ - /usr/X11R5/lib${tdelibsuff} \ - /usr/X11R4/lib${tdelibsuff} \ - \ - /usr/lib${tdelibsuff}/X11 \ - /usr/lib${tdelibsuff}/X11R6 \ - /usr/lib${tdelibsuff}/X11R5 \ - /usr/lib${tdelibsuff}/X11R4 \ - \ - /usr/local/X11/lib${tdelibsuff} \ - /usr/local/X11R6/lib${tdelibsuff} \ - /usr/local/X11R5/lib${tdelibsuff} \ - /usr/local/X11R4/lib${tdelibsuff} \ - \ - /usr/local/lib${tdelibsuff}/X11 \ - /usr/local/lib${tdelibsuff}/X11R6 \ - /usr/local/lib${tdelibsuff}/X11R5 \ - /usr/local/lib${tdelibsuff}/X11R4 \ - \ - /usr/X386/lib${tdelibsuff} \ - /usr/x386/lib${tdelibsuff} \ - /usr/XFree86/lib${tdelibsuff}/X11 \ - \ - /usr/lib${tdelibsuff} \ - /usr/local/lib${tdelibsuff} \ - /usr/unsupported/lib${tdelibsuff} \ - /usr/athena/lib${tdelibsuff} \ - /usr/local/x11r5/lib${tdelibsuff} \ - /usr/lpp/Xamples/lib${tdelibsuff} \ - /lib/usr/lib${tdelibsuff}/X11 \ - \ - /usr/openwin/lib${tdelibsuff} \ - /usr/openwin/share/lib${tdelibsuff} \ - ; \ -do Diff limit reached (max: 250 lines)

Branch: master

.gitmodules

INSTALL

Makefile.am

Makefile.cvs

NEWS

README

acinclude.m4