From eb8eab39794cc4a7fbb11b66a4f8d2d6f4d868f2 Mon Sep 17 00:00:00 2001 From: gregory guy Date: Fri, 19 Jun 2020 17:12:06 +0200 Subject: [PATCH] Drop automake build support. Add basic cmake build instructions. Write basic README file. Some cosmetics. Signed-off-by: gregory guy --- .gitmodules | 3 --- CMakeLists.txt | 2 +- INSTALL | 25 ++++++++++++++++++ Makefile.am | 29 --------------------- README | 20 ++++++++++++++ admin | 1 - configure.in.in | 59 ------------------------------------------ src/Makefile.am | 8 ------ src/daemon/Makefile.am | 59 ------------------------------------------ src/daemon/daemon.cpp | 4 +-- subdirs | 1 - 11 files changed, 48 insertions(+), 163 deletions(-) create mode 100644 INSTALL delete mode 100644 Makefile.am create mode 100644 README delete mode 160000 admin delete mode 100644 configure.in.in delete mode 100644 src/Makefile.am delete mode 100644 src/daemon/Makefile.am delete mode 100644 subdirs diff --git a/.gitmodules b/.gitmodules index bdec8fc..69dd7b2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index f2e2d2f..a6afb71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ 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} ) diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..a5010ec --- /dev/null +++ b/INSTALL @@ -0,0 +1,25 @@ +Basic Installation +================== + +kdbusnotification 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" + + +Requirement: +============ + - dbus-binding-tool (executable) + - dbus-1 + - dbus-glib-1 + - gtk2.0 + - glib2.0 diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 5d9bf01..0000000 --- a/Makefile.am +++ /dev/null @@ -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 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) diff --git a/README b/README new file mode 100644 index 0000000..3307670 --- /dev/null +++ b/README @@ -0,0 +1,20 @@ + + kdbusnotification - a DBUS notification service for TDE. + + +Kdbusnotification is a small program for the Trinity Desktop that +displays DBUS notifications via passive popups. + + + + + CONTRIBUTING +============== + +If you wish to contribute to Kdbusnotification (TDE), 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 diff --git a/admin b/admin deleted file mode 160000 index 3e80abc..0000000 --- a/admin +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3e80abcba548f353276a4f3088f9e0bb6295039c diff --git a/configure.in.in b/configure.in.in deleted file mode 100644 index 5e73167..0000000 --- a/configure.in.in +++ /dev/null @@ -1,59 +0,0 @@ -#MIN_CONFIG -AM_MAINTAINER_MODE -CXXFLAGS="$CXXFLAGS -DTQT_NO_ASCII_CAST" - -########### Check for DBus - - AC_MSG_CHECKING(for DBus) - - dbus_inc=NOTFOUND - dbus_lib=NOTFOUND - dbus=NOTFOUND - - search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0 /usr/include/*/dbus-1.0" - AC_FIND_FILE(dbus/dbus.h, $search_incs, dbus_incdir) - - search_incs_arch_deps="$kde_includes /usr/lib64/dbus-1.0/include /usr/lib/dbus-1.0/include /usr/local/lib/dbus-1.0/include /usr/lib/*/dbus-1.0/include" - AC_FIND_FILE(dbus/dbus-arch-deps.h, $search_incs_arch_deps, dbus_incdir_arch_deps) - - if [test -r $dbus_incdir/dbus/dbus.h] && [test -r $dbus_incdir_arch_deps/dbus/dbus-arch-deps.h] ; then - DBUS_INCS="-I$dbus_incdir -I$dbus_incdir_arch_deps" - dbus_inc=FOUND - fi - - search_libs="$kde_libraries /usr/lib64 /usr/lib /usr/local/lib /lib /lib64 /lib/*/ /usr/lib/*/" - AC_FIND_FILE(libdbus-1.so, $search_libs, dbus_libdir) - - if test -r $dbus_libdir/libdbus-1.so ; then - DBUS_LIBS="-L$dbus_libdir -ldbus-1" - dbus_lib=FOUND - fi - - if [test $dbus_inc = FOUND] && [test $dbus_lib = FOUND] ; then - AC_MSG_RESULT(headers $dbus_incdir $dbus_incdir_arch_deps libraries $dbus_libdir) - dbus=FOUND - else - AC_MSG_RESULT(searched but not found) - fi - - AC_SUBST(DBUS_INCS) - AC_SUBST(DBUS_LIBS) - - -########### Check the D-BUS version - - AC_MSG_CHECKING([dbus version]) - DBUS_VERSION=`$PKG_CONFIG --modversion dbus-1` - DBUS_MAJOR_VER=`echo $DBUS_VERSION | cut -d. -f 1` - DBUS_MINOR_VER=`echo $DBUS_VERSION | cut -d. -f 2` - DBUS_MICRO_VER=`echo $DBUS_VERSION | cut -d. -f 3` - - AC_MSG_RESULT($DBUS_VERSION) - AC_DEFINE_UNQUOTED(DBUS_MAJOR_VER, $DBUS_MAJOR_VER, [D-BUS major version.]) - AC_DEFINE_UNQUOTED(DBUS_MINOR_VER, $DBUS_MINOR_VER, [D-BUS minor version.]) - AC_DEFINE_UNQUOTED(DBUS_MICRO_VER, $DBUS_MICRO_VER, [D-BUS micro version.]) - - -########### Check for GTK stuff -AC_GLIB_2 -AC_GTK_2 diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index df5df15..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -# $Id$ - -SUBDIRS = \ - daemon - -# and for autostart -autostartdir = $(prefix)/share/autostart -autostart_DATA = kdbusnotification-autostart.desktop diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am deleted file mode 100644 index 8b81d63..0000000 --- a/src/daemon/Makefile.am +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: Makefile.am 2337 2007-01-11 19:17:30Z nick $ - -METASOURCES = AUTO - -DBUS_GLIB_LIBS = -ldbus-glib-1 - -INCLUDES = \ - -I$(top_srcdir) \ - -DDBUS_API_SUBJECT_TO_CHANGE \ - -DG_LOG_DOMAIN=\"notification-daemon-tde\" \ - $(DBUS_INCS) \ - $(GLIB2_CFLAGS) \ - $(GTK2_CFLAGS) \ - $(TQT_INCLUDES) \ - $(KDE_INCLUDES) - -bin_PROGRAMS = \ - notification-daemon-tde - -notification_daemon_tde_SOURCES = \ - daemon.cpp \ - daemon.h - -notification_daemon_tde_CFLAGS = \ - $(GTK_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(DBUS_GLIB_CFLAGS) - - -notification_daemon_tde_LDADD = \ - $(GTK2_LIBS) \ - $(DBUS_LIBS) \ - $(DBUS_GLIB_LIBS) \ - $(GLIB2_LIBS) \ - $(KDE_RPATH) \ - $(KDE_LDFLAGS) \ - $(LIB_TQT) \ - $(QT_LDFLAGS) \ - -lDCOP \ - $(LIB_TDECORE) \ - $(LIB_TDEUI) \ - -ltdefx \ - $(LIB_TDEIO) \ - -ltdetexteditor - -BUILT_SOURCES = \ - notificationdaemon-dbus-glue.h - -notificationdaemon-dbus-glue.h: notificationdaemon.xml - dbus-binding-tool \ - --mode=glib-server \ - --prefix=notification_daemon_tde \ - $(srcdir)/notificationdaemon.xml > notificationdaemon-dbus-glue.h - -EXTRA_DIST = \ - notificationdaemon.xml - -DISTCLEANFILES = \ - notificationdaemon-dbus-glue.h diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp index d09f080..a15c770 100644 --- a/src/daemon/daemon.cpp +++ b/src/daemon/daemon.cpp @@ -19,9 +19,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA * 02111-1307, USA. */ - +#ifdef HAVE_CONFIG_H #include "config.h" - +#endif #include #include #include diff --git a/subdirs b/subdirs deleted file mode 100644 index 28e3ee0..0000000 --- a/subdirs +++ /dev/null @@ -1 +0,0 @@ -daemon