Browse Source

Drop automake build support.

Delete empty folder doc.
Write basic cmake build instructions and README file.
Delete empty files ChangeLog, NEWS and TODO.
Some cosmetics.

Signed-off-by: gregory guy <gregory-tde@laposte.net>
pull/2/head
gregory guy 2 years ago
parent
commit
a5fed6d68f
No known key found for this signature in database
GPG Key ID: 3BCCA0F7AB4536F4
  1. 3
      .gitmodules
  2. 8
      CMakeLists.txt
  3. 1
      ChangeLog
  4. 173
      INSTALL
  5. 22
      Makefile.am
  6. 10
      Makefile.cvs
  7. 0
      NEWS
  8. 20
      README
  9. 0
      TODO
  10. 1
      admin
  11. 10
      cert-updater/Makefile.am
  12. 10
      cmdline/Makefile.am
  13. 2
      configure.files
  14. 43
      configure.in.in
  15. 6
      doc/Makefile.am
  16. 2
      doc/en/Makefile.am
  17. 3
      pics/Makefile.am
  18. 2
      po/Makefile.am
  19. 19
      src/Makefile.am
  20. 0
      stamp-h.in
  21. 6
      subdirs

3
.gitmodules vendored

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

8
CMakeLists.txt

@ -41,14 +41,13 @@ tde_setup_paths( )
##### optional stuff
option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
##### user requested modules
option( BUILD_ALL "Build all" ON )
option( BUILD_DOC "Build documentation" ${BUILD_ALL} )
option( BUILD_ALL "Build all" ON )
option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
@ -69,10 +68,9 @@ set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined"
##### directories
add_subdirectory( src )
add_subdirectory( pics )
add_subdirectory( cmdline )
add_subdirectory( cert-updater )
add_subdirectory( pics )
#tde_conditional_add_subdirectory( BUILD_DOC doc )
tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po )

1
ChangeLog

@ -1 +0,0 @@
2012-05-17 - Initial Release

173
INSTALL

@ -1,167 +1,22 @@
Basic Installation
==================
These are generic installation instructions.
kcmldap relies on cmake to build.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
you can run in the future to recreate the current configuration, a file
`config.cache' that saves the results of its tests to speed up
reconfiguring, and a file `config.log' containing compiler output
(useful mainly for debugging `configure').
Here are suggested default options:
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If at some point `config.cache'
contains results you don't want to keep, you may remove or edit it.
-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 file `configure.in' is used to create `configure' by a program
called `autoconf'. You only need `configure.in' if you want to change
it or regenerate `configure' using a newer version of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system. If you're
using `csh' on an old version of System V, you might need to type
`sh ./configure' instead to prevent `csh' from trying to execute
`configure' itself.
Running `configure' takes a while. While running, it prints some
messages telling which features it is checking for.
2. Type `make' to compile the package.
3. Type `make install' to install the programs and any data files and
documentation.
4. You can remove the program binaries and object files from the
source code directory by typing `make clean'.
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that
the `configure' script does not know about. You can give `configure'
initial values for variables by setting them in the environment. Using
a Bourne-compatible shell, you can do that on the command line like
this:
CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
Or on systems that have the `env' program, you can do it like this:
env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
Compiling For Multiple Architectures
====================================
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you must use a version of `make' that
supports the `VPATH' variable, such as GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
If you have to use a `make' that does not supports the `VPATH'
variable, you have to compile the package for one architecture at a time
in the source code directory. After you have installed the package for
one architecture, use `make distclean' before reconfiguring for another
architecture.
Installation Names
==================
By default, `make install' will install the package's files in
`/usr/local/bin', `/usr/local/man', etc. You can specify an
installation prefix other than `/usr/local' by giving `configure' the
option `--prefix=PATH'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
give `configure' the option `--exec-prefix=PATH', the package will use
PATH as the prefix for installing programs and libraries.
Documentation and other data files will still use the regular prefix.
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
`README' should mention any `--enable-' and `--with-' options that the
package recognizes.
For packages that use the X Window System, `configure' can usually
find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
Specifying the System Type
==========================
There may be some features `configure' can not figure out
automatically, but needs to determine by the type of host the package
will run on. Usually `configure' can figure that out, but if it prints
a message saying it can not guess the host type, give it the
`--host=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name with three fields:
CPU-COMPANY-SYSTEM
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
need to know the host type.
If you are building compiler tools for cross-compiling, you can also
use the `--target=TYPE' option to select the type of system they will
produce code for and the `--build=TYPE' option to select the type of
system on which you are compiling the package.
Sharing Defaults
================
If you want to set default values for `configure' scripts to share,
you can create a site shell script called `config.site' that gives
default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
A warning: not all `configure' scripts look for a site script.
Operation Controls
==================
`configure' recognizes the following options to control how it
operates.
`--cache-file=FILE'
Use and save the results of the tests in FILE instead of
`./config.cache'. Set FILE to `/dev/null' to disable caching, for
debugging `configure'.
`--help'
Print a summary of the options to `configure', and exit.
`--quiet'
`--silent'
`-q'
Do not print messages saying which checks are being made.
`--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
`--version'
Print the version of Autoconf used to generate the `configure'
script, and exit.
`configure' also accepts some other, not widely useful, options.
Requirements:
=============
- libtdeldap

22
Makefile.am

@ -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

10
Makefile.cvs

@ -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:

20
README

@ -0,0 +1,20 @@
kcmldap - a Kerberos control module for the Trinity control center.
Kcmldap is a Trinity control center module to manage connections to
Kerberos realms.
CONTRIBUTING
==============
If you wish to contribute kcmldap, you might do so:
- TDE Gitea Workspace (TGW) collaboration tool.
https://mirror.git.trinitydesktop.org/gitea
- TDE Weblate Translation Workspace (TWTW) collaboration tool.
https://mirror.git.trinitydesktop.org/weblate

1
admin

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

10
cert-updater/Makefile.am

@ -1,10 +0,0 @@
INCLUDES= $(all_includes) $(KDE_INCLUDES)/tde $(KRB5_CFLAGS)
bin_PROGRAMS = tdeldapcertupdater
tdeldapcertupdater_SOURCES = main.cpp
tdeldapcertupdater_METASOURCES = AUTO
tdeldapcertupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeldap $(KRB5_LIBS)
KDE_OPTIONS = nofinal

10
cmdline/Makefile.am

@ -1,10 +0,0 @@
INCLUDES= $(all_includes) $(KDE_INCLUDES)/tde $(KRB5_CFLAGS)
bin_PROGRAMS = tdeldapbonding
tdeldapbonding_SOURCES = main.cpp
tdeldapbonding_METASOURCES = AUTO
tdeldapbonding_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeldap $(KRB5_LIBS)
KDE_OPTIONS = nofinal

2
configure.files

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

43
configure.in.in

@ -1,43 +0,0 @@
#MIN_CONFIG(3.2.0)
AM_INIT_AUTOMAKE(autostart, 0.1)
AC_C_BIGENDIAN
AC_CHECK_KDEMAXPATHLEN
PKG_CHECK_MODULES(KRB5, krb5, have_krb5=yes, have_krb5=no)
if test "x$have_krb5" = "xno"; then
# Try to find krb5 without pkg-config file
AC_MSG_CHECKING(krb5)
AC_FIND_FILE(krb5.h, [\
/usr/local/include/heimdal /usr/local/include \
/usr/include/heimdal /usr/include \
], krb5_includes)
if test "x$krb5_includes" != "xNO"; then
krb5_multiarch="`gcc -print-multiarch 2>/dev/null`"
AC_FIND_FILE(libkrb5.so, [\
/usr/local/lib/$krb5_multiarch/heimdal /usr/local/lib64/heimdal /usr/local/lib/heimdal \
/usr/local/lib/$krb5_multiarch /usr/local/lib64 /usr/local/lib \
/usr/lib/$krb5_multiarch/heimdal /usr/lib64/heimdal /usr/lib/heimdal \
/usr/lib/$krb5_multiarch /usr/lib64 /usr/lib \
], krb5_libs)
if test "x$krb5_libs" != "xNO"; then
AC_MSG_RESULT([libraries $krb5_libs, headers $krb5_includes])
CPPFLAGS="$CPPFLAGS -I$krb5_includes"
CFLAGS="$CFLAGS -I$krb5_includes"
LDFLAGS="$LDFLAGS -L$krb5_libs"
AC_CHECK_HEADER(krb5.h, have_krb5=yes)
fi
fi
if test "x$have_krb5" != "xno"; then
KRB5_CFLAGS="-I$krb5_includes"
KRB5_LIBS="-L$krb5_libs -lkrb5"
AC_SUBST(KRB5_CFLAGS)
AC_SUBST(KRB5_LIBS)
else
AC_MSG_RESULT(no)
fi
fi
if test "x$have_krb5" = "xno"; then
AC_MSG_ERROR([krb5 library is needed but not found on our system])
fi

6
doc/Makefile.am

@ -1,6 +0,0 @@
# the SUBDIRS is filled automatically by am_edit. If files are
# in this directory they are installed into the english dir
KDE_LANG = en
KDE_DOCS = autostart
SUBDIRS = $(AUTODIRS)

2
doc/en/Makefile.am

@ -1,2 +0,0 @@
KDE_DOCS = ldap
KDE_LANG = en

3
pics/Makefile.am

@ -1,3 +0,0 @@
kpersonalizer_pics_data_DATA = kcmldapbonding_step1.png kcmldapbonding_step3.png
kpersonalizer_pics_datadir = $(datarootdir)/pixmaps

2
po/Makefile.am

@ -1,2 +0,0 @@
POFILES = AUTO
# noinst_HEADERS = ldap.pot

19
src/Makefile.am

@ -1,19 +0,0 @@
INCLUDES = $(all_includes) $(KDE_INCLUDES)/tde $(KRB5_CFLAGS)
METASOURCES = AUTO
# Install this plugin in the KDE modules directory
kde_module_LTLIBRARIES = kcm_ldapbonding.la
kcm_ldapbonding_la_SOURCES = tdeumaskinput.cpp ldapbonding.cpp ldapconfigbase.ui realmpropertiesdialog.cpp bondintropage.cpp bondintropagedlg.ui bondrealmpage.cpp bondrealmpagedlg.ui bondfinishpage.cpp bondfinishpagedlg.ui bondwizard.cpp ldappasswddlg.cpp
kcm_ldapbonding_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI) -ltdeldap
kcm_ldapbonding_la_LDFLAGS = -avoid-version -module -no-undefined \
$(all_libraries) $(KRB5_LIBS)
xdg_apps_DATA = ldapbonding.desktop
messages: rc.cpp
$(EXTRACTRC) `find -name \*.ui -o -name \*.rc` > rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kcmldap.pot

0
stamp-h.in

6
subdirs

@ -1,6 +0,0 @@
cert-updater
cmdline
doc
pics
po
src
Loading…
Cancel
Save