From d52adff6508d6778523b7743b5087d878f115fd4 Mon Sep 17 00:00:00 2001 From: K D Hedger Date: Fri, 17 Jan 2025 12:32:30 +0000 Subject: [PATCH] fixed include directives --- LFSTray/LFSTray/flagsandlibs | 7 +++++++ LFSTray/LFSTray/src/embed.cpp | 2 +- LFSTray/LFSTray/src/{common.h => globals.h} | 0 LFSTray/LFSTray/src/icons.cpp | 2 +- LFSTray/LFSTray/src/image.cpp | 2 +- LFSTray/LFSTray/src/layout.cpp | 2 +- LFSTray/LFSTray/src/main.cpp | 2 +- LFSTray/LFSTray/src/settings.cpp | 2 +- LFSTray/LFSTray/src/tray.cpp | 2 +- LFSTray/LFSTray/src/tray.h | 2 +- LFSTray/LFSTray/src/wmh.cpp | 2 +- LFSTray/LFSTray/src/xembed.cpp | 2 +- LFSTray/LFSTray/src/xutils.cpp | 2 +- LFSTray/LFSTray/src/xutils.h | 2 +- LFSTray/README.md | 2 ++ LFSTray/TODO | 3 ++- LFSTray/configure.ac | 20 ++++++++++++++++++++ 17 files changed, 43 insertions(+), 13 deletions(-) rename LFSTray/LFSTray/src/{common.h => globals.h} (100%) diff --git a/LFSTray/LFSTray/flagsandlibs b/LFSTray/LFSTray/flagsandlibs index 5623a639..6e15c6b9 100644 --- a/LFSTray/LFSTray/flagsandlibs +++ b/LFSTray/LFSTray/flagsandlibs @@ -1,6 +1,10 @@ AM_CPPFLAGS = -I$(top_srcdir) \ $(X11_CFLAGS) \ + $(XFT_CFLAGS) \ + $(CAIRO_CFLAGS) \ + $(LIBGLIB_CFLAGS) + $(LFSTK_CFLAGS) -DPREFIX=\""${prefix}\"" \ -DDATADIR=\""${pkgdatadir}"\" \ -DSYSCONFDIR=\""${sysconfdir}/${PACKAGE}"\" \ @@ -8,5 +12,8 @@ AM_CPPFLAGS = -I$(top_srcdir) \ LIBS = $(X11_LIBS) \ $(XPM_LIBS) \ + $(XFT_LIBS) \ + $(LIBGLIB_LIBS) \ + $(LFSTK_LIBS) \ -lm \ -lstdc++fs diff --git a/LFSTray/LFSTray/src/embed.cpp b/LFSTray/LFSTray/src/embed.cpp index e60d9e84..3b20a345 100644 --- a/LFSTray/LFSTray/src/embed.cpp +++ b/LFSTray/LFSTray/src/embed.cpp @@ -37,7 +37,7 @@ #include #include "embed.h" -#include "common.h" +#include "globals.h" #include "icons.h" #include "settings.h" #include "tray.h" diff --git a/LFSTray/LFSTray/src/common.h b/LFSTray/LFSTray/src/globals.h similarity index 100% rename from LFSTray/LFSTray/src/common.h rename to LFSTray/LFSTray/src/globals.h diff --git a/LFSTray/LFSTray/src/icons.cpp b/LFSTray/LFSTray/src/icons.cpp index 1e7bef5b..5aed6d09 100644 --- a/LFSTray/LFSTray/src/icons.cpp +++ b/LFSTray/LFSTray/src/icons.cpp @@ -35,7 +35,7 @@ #include #include "icons.h" -#include "common.h" +#include "globals.h" #include "layout.h" #include "list.h" #include "tray.h" diff --git a/LFSTray/LFSTray/src/image.cpp b/LFSTray/LFSTray/src/image.cpp index b38f1fb0..82b0d2d3 100644 --- a/LFSTray/LFSTray/src/image.cpp +++ b/LFSTray/LFSTray/src/image.cpp @@ -29,7 +29,7 @@ * interface * -------------------------------*/ -#include "common.h" +#include "globals.h" #include "image.h" /***** Forward declarations *****/ diff --git a/LFSTray/LFSTray/src/layout.cpp b/LFSTray/LFSTray/src/layout.cpp index 8f817f53..a3d2ada5 100644 --- a/LFSTray/LFSTray/src/layout.cpp +++ b/LFSTray/LFSTray/src/layout.cpp @@ -35,7 +35,7 @@ #include #include "config.h" -#include "common.h" +#include "globals.h" #include "icons.h" #include "layout.h" #include "list.h" diff --git a/LFSTray/LFSTray/src/main.cpp b/LFSTray/LFSTray/src/main.cpp index 188bac2b..21cf50c5 100644 --- a/LFSTray/LFSTray/src/main.cpp +++ b/LFSTray/LFSTray/src/main.cpp @@ -44,7 +44,7 @@ #include "config.h" -#include "common.h" +#include "globals.h" #include "embed.h" #include "icons.h" #include "layout.h" diff --git a/LFSTray/LFSTray/src/settings.cpp b/LFSTray/LFSTray/src/settings.cpp index 1d4b9196..f7308792 100644 --- a/LFSTray/LFSTray/src/settings.cpp +++ b/LFSTray/LFSTray/src/settings.cpp @@ -45,7 +45,7 @@ #include #include "config.h" -#include "common.h" +#include "globals.h" #include "layout.h" #include "list.h" #include "settings.h" diff --git a/LFSTray/LFSTray/src/tray.cpp b/LFSTray/LFSTray/src/tray.cpp index ad1ad7c2..9f1aa02c 100644 --- a/LFSTray/LFSTray/src/tray.cpp +++ b/LFSTray/LFSTray/src/tray.cpp @@ -41,7 +41,7 @@ #include -#include "common.h" +#include "globals.h" #include "embed.h" #include "icons.h" #include "image.h" diff --git a/LFSTray/LFSTray/src/tray.h b/LFSTray/LFSTray/src/tray.h index eeef5bc2..02a809af 100644 --- a/LFSTray/LFSTray/src/tray.h +++ b/LFSTray/LFSTray/src/tray.h @@ -37,7 +37,7 @@ #include -#include "common.h" +#include "globals.h" #include "config.h" #include "icons.h" diff --git a/LFSTray/LFSTray/src/wmh.cpp b/LFSTray/LFSTray/src/wmh.cpp index 85d9e822..c8bea316 100644 --- a/LFSTray/LFSTray/src/wmh.cpp +++ b/LFSTray/LFSTray/src/wmh.cpp @@ -30,7 +30,7 @@ #include #include -#include "common.h" +#include "globals.h" #include "wmh.h" #include "xutils.h" diff --git a/LFSTray/LFSTray/src/xembed.cpp b/LFSTray/LFSTray/src/xembed.cpp index 7f217b0f..b9d5a858 100644 --- a/LFSTray/LFSTray/src/xembed.cpp +++ b/LFSTray/LFSTray/src/xembed.cpp @@ -37,7 +37,7 @@ #include #include -#include "common.h" +#include "globals.h" #include "wmh.h" #include "xembed.h" #include "xutils.h" diff --git a/LFSTray/LFSTray/src/xutils.cpp b/LFSTray/LFSTray/src/xutils.cpp index 73345e50..fac8f271 100644 --- a/LFSTray/LFSTray/src/xutils.cpp +++ b/LFSTray/LFSTray/src/xutils.cpp @@ -40,7 +40,7 @@ #include #include "xutils.h" -#include "common.h" +#include "globals.h" #include "xembed.h" static int trapped_x11_error_code=0; diff --git a/LFSTray/LFSTray/src/xutils.h b/LFSTray/LFSTray/src/xutils.h index d120e672..29af392a 100644 --- a/LFSTray/LFSTray/src/xutils.h +++ b/LFSTray/LFSTray/src/xutils.h @@ -34,7 +34,7 @@ #include #include -#include "common.h" +#include "globals.h" #include "icons.h" /* Returns 1 if connection is active,0 otherwise */ diff --git a/LFSTray/README.md b/LFSTray/README.md index e0789446..86846394 100644 --- a/LFSTray/README.md +++ b/LFSTray/README.md @@ -11,6 +11,8 @@ https://github.com/kolbusa/stalonetray make make install ``` + +You dont need to install to try it out just run lfstray from the app folder. ### **QUICK USE:** lfstray -h diff --git a/LFSTray/TODO b/LFSTray/TODO index 44a90300..c9577fc3 100644 --- a/LFSTray/TODO +++ b/LFSTray/TODO @@ -1,7 +1,8 @@ LOADS! rearange files - DONE -convert to c++ +convert to c++ - STARTED ... + integerate into lfstoolkit lib redo settings add prefs app diff --git a/LFSTray/configure.ac b/LFSTray/configure.ac index c6b94108..4e1f7286 100644 --- a/LFSTray/configure.ac +++ b/LFSTray/configure.ac @@ -30,8 +30,28 @@ PKG_CHECK_MODULES(XPM, $XPM_MODULES,AC_DEFINE(XPM_SUPPORTED,1,[enable XPM backgr AC_SUBST(XPM_CFLAGS) AC_SUBST(XPM_LIBS) +XFT_MODULES="xft >= 2.3.1" +PKG_CHECK_MODULES(XFT, $XFT_MODULES) +AC_SUBST(XFT_CFLAGS) +AC_SUBST(XFT_LIBS) + dnl ============= X11 ================ +CAIRO_MODULES="cairo >= 1.12.16" +PKG_CHECK_MODULES(CAIRO, $CAIRO_MODULES) +AC_SUBST(CAIRO_LIBS) +AC_SUBST(CAIRO_CFLAGS) + +LIBGLIB_MODULES="glib-2.0 >= 2.60.0" +PKG_CHECK_MODULES(LIBGLIB, $LIBGLIB_MODULES) +AC_SUBST(LIBGLIB_LIBS) +AC_SUBST(LIBGLIB_CFLAGS) + +LFSTK_MODULES="lfstk >= 0.6.1" +PKG_CHECK_MODULES(LFSTK, $LFSTK_MODULES) +AC_SUBST(LFSTK_LIBS) +AC_SUBST(LFSTK_CFLAGS) + AC_CONFIG_FILES([Makefile LFSTray/app/Makefile]) AC_OUTPUT