Browse Source

Drop automake build support.

Move AUTHORS, COPYING, ChangeLog, INSTALL, README and TODO files
from the "src" folder to the root of the package.
Add basic build instructions with cmake in the INSTALL file.
pull/6/head
gregory guy 2 years ago
parent
commit
8059247488
No known key found for this signature in database GPG Key ID: 3BCCA0F7AB4536F4
  1. 3
      .gitmodules
  2. 0
      AUTHORS
  3. 0
      COPYING
  4. 0
      ChangeLog
  5. 21
      INSTALL
  6. 29
      Makefile.am
  7. 28
      Makefile.am.in
  8. 14
      Makefile.cvs
  9. 4
      README
  10. 0
      TODO
  11. 10715
      acinclude.m4
  12. 11603
      aclocal.m4
  13. 1
      admin
  14. 196
      config.h.in
  15. 2
      configure.files
  16. 82
      configure.in
  17. 5
      configure.in.in
  18. 3
      doc/Makefile.am
  19. 18
      doc/en/Makefile.am
  20. 18
      icons/Makefile.am
  21. 0
      patch-stamp
  22. 50
      src/Makefile.am
  23. 0
      stamp-h.in
  24. 3
      subdirs

3
.gitmodules

@ -1,6 +1,3 @@
[submodule "admin"]
path = admin
url = http://system@scm.trinitydesktop.org/scm/git/tde-common-admin
[submodule "cmake"]
path = cmake
url = http://system@scm.trinitydesktop.org/scm/git/tde-common-cmake

0
src/AUTHORS → AUTHORS

0
src/COPYING → COPYING

0
src/ChangeLog → ChangeLog

21
src/INSTALL → INSTALL

@ -1,6 +1,27 @@
Basic Installation
==================
kcpuload 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 - September 30 2019 #####
These are generic installation instructions.
The `configure' shell script attempts to guess correct values for

29
Makefile.am

@ -1,29 +0,0 @@
AUTOMAKE_OPTIONS = foreign 1.5
install-data-local:
@echo ""
@echo ""
@echo ""
@echo "*************** Important *************************"
@echo ""
@echo " Add "$(bindir)" to your PATH"
@echo ""
@echo " Please report bugs with our web form at"
@echo " http://bugs.kde.org."
@echo ""
@echo " Stephan Kulow <coolo@kde.org> and all the KDE"
@echo " developers wish you fun with the KDE."
@echo "****************************************************"
@echo ""
$(top_srcdir)/acinclude.m4: $(shell find . -name acinclude.m4.in) $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in
@cd $(top_srcdir) && cat $^ > acinclude.m4;
$(top_srcdir)/configure.in: $(top_srcdir)/configure.files $(shell test -f $(top_srcdir)/configure.files && sed -e "s%^%\$(top_srcdir)/%" $(top_srcdir)/configure.files) $(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)/configure.files:
cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files
SUBDIRS=$(TOPSUBDIRS)

28
Makefile.am.in

@ -1,28 +0,0 @@
AUTOMAKE_OPTIONS = foreign 1.5
install-data-local:
@echo ""
@echo ""
@echo ""
@echo "*************** Important *************************"
@echo ""
@echo " Add "$(bindir)" to your PATH"
@echo ""
@echo " Please report bugs with our web form at"
@echo " http://bugs.kde.org."
@echo ""
@echo " Stephan Kulow <coolo@kde.org> and all the KDE"
@echo " developers wish you fun with the KDE."
@echo "****************************************************"
@echo ""
$(top_srcdir)/acinclude.m4: $(shell find . -name acinclude.m4.in) $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in
@cd $(top_srcdir) && cat $^ > acinclude.m4;
$(top_srcdir)/configure.in: $(top_srcdir)/configure.files $(shell test -f $(top_srcdir)/configure.files && sed -e "s%^%\$(top_srcdir)/%" $(top_srcdir)/configure.files) $(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)/configure.files:
cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files

14
Makefile.cvs

@ -1,14 +0,0 @@
all:
@echo "This Makefile is only for the CVS repository"
@echo "This will be deleted before making the distribution"
@echo ""
@if test ! -d admin; then \
echo "Please recheckout this module!" ;\
echo "for cvs: use checkout once and after that update again" ;\
echo "for cvsup: checkout kde-common from cvsup and" ;\
echo " link kde-common/admin to ./admin" ;\
exit 1 ;\
fi
$(MAKE) -f admin/Makefile.common cvs
.SILENT:

4
src/README → README

@ -19,11 +19,7 @@ can be shown, or you can choose to have one separate diagram for each of the
CPUs. Left click on the diagram to bring up a small information box which
will show the exact CPU usage in text form.
Install:
./configure
make
make install
Markus Gustavsson <mighty@fragzone.se>

0
src/TODO → TODO

10715
acinclude.m4

File diff suppressed because it is too large

11603
aclocal.m4

File diff suppressed because it is too large

1
admin

@ -1 +0,0 @@
Subproject commit 68f23556e638353e46b444d3a4863a64936bd36a

196
config.h.in

@ -1,196 +0,0 @@
/* config.h.in. Generated from configure.in by autoheader. */
/* Define if you have the CoreAudio API */
#undef HAVE_COREAUDIO
/* Define to 1 if you have the <crt_externs.h> header file. */
#undef HAVE_CRT_EXTERNS_H
/* Defines if your system has the crypt function */
#undef HAVE_CRYPT
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define if you have libjpeg */
#undef HAVE_LIBJPEG
/* Define if you have libpng */
#undef HAVE_LIBPNG
/* Define if you have a working libpthread (will enable threaded code) */
#undef HAVE_LIBPTHREAD
/* Define if you have libz */
#undef HAVE_LIBZ
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define if your system needs _NSGetEnviron to set up the environment */
#undef HAVE_NSGETENVIRON
/* Define to 1 if you have the <pthread/linuxthreads/pthread.h> header file.
*/
#undef HAVE_PTHREAD_LINUXTHREADS_PTHREAD_H
/* Define if you have the res_init function */
#undef HAVE_RES_INIT
/* Define to 1 if you have the `snprintf' function. */
#undef HAVE_SNPRINTF
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define if you have strlcat */
#undef HAVE_STRLCAT
/* Define if you have the strlcat prototype */
#undef HAVE_STRLCAT_PROTO
/* Define if you have strlcpy */
#undef HAVE_STRLCPY
/* Define if you have the strlcpy prototype */
#undef HAVE_STRLCPY_PROTO
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to 1 if you have the `vsnprintf' function. */
#undef HAVE_VSNPRINTF
/* Suffix for lib directories */
#undef KDELIBSUFF
/* Name of package */
#undef PACKAGE
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */
#undef PACKAGE_NAME
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* The size of a `char *', as computed by sizeof. */
#undef SIZEOF_CHAR_P
/* The size of a `int', as computed by sizeof. */
#undef SIZEOF_INT
/* The size of a `long', as computed by sizeof. */
#undef SIZEOF_LONG
/* The size of a `size_t', as computed by sizeof. */
#undef SIZEOF_SIZE_T
/* The size of a `unsigned long', as computed by sizeof. */
#undef SIZEOF_UNSIGNED_LONG
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Version number of package */
#undef VERSION
/*
* jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
* headers and I'm too lazy to write a configure test as long as only
* unixware is related
*/
#ifdef _UNIXWARE
#define HAVE_BOOLEAN
#endif
/*
* AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
* that defines bzero.
*/
#if defined(_AIX)
#include <strings.h>
#endif
#if !defined(HAVE_STRLCAT_PROTO)
#ifdef __cplusplus
extern "C"
#endif
unsigned long strlcat(char*, const char*, unsigned long);
#endif
#if !defined(HAVE_STRLCPY_PROTO)
#ifdef __cplusplus
extern "C"
#endif
unsigned long strlcpy(char*, const char*, unsigned long);
#endif
/*
* On HP-UX, the declaration of vsnprintf() is needed every time !
*/
#if !defined(HAVE_VSNPRINTF) || defined(hpux)
#if __STDC__
#include <stdarg.h>
#include <stdlib.h>
#else
#include <varargs.h>
#endif
#ifdef __cplusplus
extern "C"
#endif
int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
#ifdef __cplusplus
extern "C"
#endif
int snprintf(char *str, size_t n, char const *fmt, ...);
#endif
#if defined(__SVR4) && !defined(__svr4__)
#define __svr4__ 1
#endif
/* Compatibility define */
#undef ksize_t
/* Define the real type of socklen_t */
#undef socklen_t

2
configure.files

@ -1,2 +0,0 @@
./admin/configure.in.min
configure.in.in

82
configure.in

@ -1,82 +0,0 @@
dnl This file is part of the KDE libraries/packages
dnl Copyright (C) 2001 Stephan Kulow (coolo@kde.org)
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.
# Original Author was Kalle@kde.org
# I lifted it in some mater. (Stephan Kulow)
# I used much code from Janos Farkas
dnl Process this file with autoconf to produce a configure script.
AC_INIT(acinclude.m4) dnl a source file from your sub dir
dnl This is so we can use kde-common
AC_CONFIG_AUX_DIR(admin)
dnl This ksh/zsh feature conflicts with `cd blah ; pwd`
unset CDPATH
dnl Checking host/target/build systems, for make, install etc.
AC_CANONICAL_SYSTEM
dnl Perform program name transformation
AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(kcpuload-1.99, "3.1.0") dnl searches for some needed programs
KDE_SET_PREFIX
dnl generate the config header
AM_CONFIG_HEADER(config.h) dnl at the distribution this done
dnl Checks for programs.
AC_CHECK_COMPILERS
AC_ENABLE_SHARED(yes)
AC_ENABLE_STATIC(no)
KDE_PROG_LIBTOOL
dnl for NLS support. Call them in this order!
dnl WITH_NLS is for the po files
AM_KDE_WITH_NLS
dnl KDE_USE_TQT
AC_PATH_KDE
#MIN_CONFIG
AM_MAINTAINER_MODE
CXXFLAGS="$CXXFLAGS -DTQT_NO_ASCII_CAST"
KDE_CREATE_SUBDIRSLIST
AM_CONDITIONAL(doc_SUBDIR_included, test "x$doc_SUBDIR_included" = xyes)
AM_CONDITIONAL(kcpuload_SUBDIR_included, test "x$kcpuload_SUBDIR_included" = xyes)
AC_CONFIG_FILES([ Makefile ])
AC_CONFIG_FILES([ doc/Makefile ])
AC_CONFIG_FILES([ doc/kcpuload/Makefile ])
AC_CONFIG_FILES([ kcpuload/Makefile ])
AC_CONFIG_FILES([ kcpuload/icons/Makefile ])
AC_CONFIG_FILES([ kcpuload/kcpuload/Makefile ])
AC_OUTPUT
if test "$all_tests" = "bad"; then
if test ! "$cache_file" = "/dev/null"; then
echo ""
echo "Please remove the file $cache_file after changing your setup"
echo "so that configure will find the changes next time."
echo ""
fi
else
echo ""
echo "Good - your configure finished. Start make now"
echo ""
fi

5
configure.in.in

@ -1,5 +0,0 @@
#MIN_CONFIG
KDE_ENABLE_HIDDEN_VISIBILITY
KDE_INIT_DOXYGEN([KDE Utils API Reference], [Version $VERSION])
AM_MAINTAINER_MODE
CXXFLAGS="$CXXFLAGS -DTQT_NO_ASCII_CAST"

3
doc/Makefile.am

@ -1,3 +0,0 @@
KDE_LANG = en
KDE_DOCS = AUTO
SUBDIRS = $(AUTODIRS)

18
doc/en/Makefile.am

@ -1,18 +0,0 @@
############################################################################
# #
# English KCPULoad documentation. #
# #
# KCPULoad is copyright (c) 1999-2000, Markus Gustavsson #
# (c) 2002, Ben Burton #
# #
# This program is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
# (at your option) any later version. #
# #
############################################################################
KDE_DOCS = kcpuload
KDE_LANG = en

18
icons/Makefile.am

@ -1,18 +0,0 @@
############################################################################
# #
# KCPULoad action icons. #
# #
# KCPULoad is copyright (c) 1999-2000, Markus Gustavsson #
# (c) 2002, Ben Burton #
# #
# This program is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
# (at your option) any later version. #
# #
############################################################################
iconsdir = $(kde_datadir)/kcpuload/icons
icons_ICON = AUTO

0
patch-stamp

50
src/Makefile.am

@ -1,50 +0,0 @@
############################################################################
# #
# Main KCPULoad sources. #
# #
# KCPULoad is copyright (c) 1999-2000, Markus Gustavsson #
# (c) 2002, Ben Burton #
# #
# This program is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
# (at your option) any later version. #
# #
############################################################################
INCLUDES = $(all_includes)
bin_PROGRAMS = kcpuload
kcpuload_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kcpuload_LDADD = $(LIB_TDEUI)
kcpuload_SOURCES = \
icontoggleaction.cpp \
kcpudock.cpp \
kcpuload.cpp \
kcpuproc.cpp \
main.cpp \
statdock.cpp \
speeddialog.cpp \
statpopup.cpp
noinst_HEADERS = \
icontoggleaction.h \
kcpudock.h \
kcpuload.h \
kcpuproc.h \
speeddialog.h \
statdock.h \
statpopup.h
METASOURCES = AUTO
appsdir = $(kde_appsdir)/System
apps_DATA = kcpuload.desktop
KDE_ICON = kcpuload
EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO

0
stamp-h.in

3
subdirs

@ -1,3 +0,0 @@
doc
icons
kcpuload
Loading…
Cancel
Save