[Xfce4-commits] [xfce/xfce4-session] 01/01: Splash engines are not present anymore in xfce4-session

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

s   k   u   n   n   y   k       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfce4-session.

commit a4e499e23ade4f019f56fde944c90f1eb284219b
Author: Olivier Duchateau <duchateau.olivier at gmail.com>
Date:   Sun May 19 16:24:29 2019 +0200

    Splash engines are not present anymore in xfce4-session
    
    - Rename libxfsm-4.6 to libxfsm
    - Drop xfce4-session-2.0 pkgconfig file
    - Fix bug #15417
---
 configure.ac.in                  |  1 -
 libxfsm/Makefile.am              | 26 ++++++++------------------
 libxfsm/xfce4-session-2.0.pc.in  | 11 -----------
 settings/Makefile.am             |  6 ++----
 xfce4-session/Makefile.am        |  6 ++----
 xfsm-shutdown-helper/Makefile.am |  1 +
 6 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index d177b14..525f6eb 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -189,7 +189,6 @@ icons/48x48/Makefile
 icons/128x128/Makefile
 icons/scalable/Makefile
 libxfsm/Makefile
-libxfsm/xfce4-session-2.0.pc
 po/Makefile.in
 settings/Makefile
 scripts/Makefile
diff --git a/libxfsm/Makefile.am b/libxfsm/Makefile.am
index 1b61dca..0de0261 100644
--- a/libxfsm/Makefile.am
+++ b/libxfsm/Makefile.am
@@ -1,36 +1,26 @@
 AM_CPPFLAGS =								\
 	-I$(top_srcdir)
 
-# common library
-lib_LTLIBRARIES = libxfsm-4.6.la
+noinst_LTLIBRARIES = libxfsm.la
 
-libxfsm_4_6_la_SOURCES =						\
+libxfsm_la_SOURCES =                    \
 	xfsm-util.h							\
 	xfsm-util.c							\
 	xfsm-shutdown-common.h
 
-libxfsm_4_6_la_CFLAGS =							\
+libxfsm_la_CFLAGS =							\
 	$(LIBX11_CFLAGS)						\
-	$(LIBXFCE4UI_CFLAGS)						\
+	$(LIBXFCE4UI_CFLAGS)                    \
+	$(LIBXFCE4UTIL_CFLAGS)                  \
 	$(XFCONF_CFLAGS)
 
-libxfsm_4_6_la_LDFLAGS =						\
-	-export-dynamic							\
-	-version-info 0:0:0						\
-	$(LIBX11_LDFLAGS)
-
 if HAVE_OS_CYGWIN
-libxfsm_4_6_la_LDFLAGS +=						\
+libxfsm_la_LDFLAGS =						\
 	-no-undefined
 endif
 
-libxfsm_4_6_la_LIBADD =							\
+libxfsm_la_LIBADD =							\
 	$(LIBX11_LIBS)							\
 	$(LIBXFCE4UI_LIBS)						\
+	$(LIBXFCE4UTIL_LIBS)                    \
 	$(XFCONF_LIBS)
-
-libxfsmincludedir =							\
-	$(includedir)/xfce4/xfce4-session-4.6/libxfsm
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = xfce4-session-2.0.pc
diff --git a/libxfsm/xfce4-session-2.0.pc.in b/libxfsm/xfce4-session-2.0.pc.in
deleted file mode 100644
index f11af05..0000000
--- a/libxfsm/xfce4-session-2.0.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: xfce4-session
-Description: Xfce 4 session manager
-Requires: libxfce4ui-2 libxfconf-0
-Version: @VERSION@
-Libs: -L${libdir} -lxfsm-4.6
-Cflags: -I${includedir}/xfce4/xfce4-session-4.6
diff --git a/settings/Makefile.am b/settings/Makefile.am
index 4c85c44..26c0d86 100644
--- a/settings/Makefile.am
+++ b/settings/Makefile.am
@@ -22,6 +22,7 @@ xfce4_session_settings_CFLAGS = \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DG_LOG_DOMAIN=\"xfce4-session-settings\" \
 	-I$(top_srcdir) \
+	-I$(top_srcdir)/libxfsm \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(LIBXFCE4UI_CFLAGS) \
 	$(XFCONF_CFLAGS) \
@@ -29,16 +30,13 @@ xfce4_session_settings_CFLAGS = \
 	$(GMODULE_CFLAGS)
 
 xfce4_session_settings_LDADD = \
-	$(top_builddir)/libxfsm/libxfsm-4.6.la \
+	$(top_builddir)/libxfsm/libxfsm.la \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(LIBXFCE4UI_LIBS) \
 	$(XFCONF_LIBS) \
 	$(GIO_LIBS) \
 	$(GMODULE_LIBS)
 
-xfce4_session_settings_DEPENDENCIES = \
-	$(top_builddir)/libxfsm/libxfsm-4.6.la
-
 settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml
 settings_DATA = xfce4-session.xml
 
diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
index 3e9b3f6..fc7d41f 100644
--- a/xfce4-session/Makefile.am
+++ b/xfce4-session/Makefile.am
@@ -2,6 +2,7 @@
 AM_CPPFLAGS =								\
 	-I$(top_builddir)						\
 	-I$(top_srcdir)							\
+	-I$(top_srcdir)/libxfsm                                         \
 	-DG_LOG_DOMAIN=\"xfce4-session\"				\
 	-DLIBDIR=\"$(libdir)\"						\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
@@ -87,7 +88,7 @@ xfce4_session_LDFLAGS =							\
 	$(PLATFORM_LDFLAGS)
 
 xfce4_session_LDADD =							\
-	$(top_builddir)/libxfsm/libxfsm-4.6.la				\
+	$(top_builddir)/libxfsm/libxfsm.la				\
 	$(LIBSM_LDFLAGS)						\
 	$(LIBSM_LIBS)							\
 	$(LIBX11_LDFLAGS)						\
@@ -100,9 +101,6 @@ xfce4_session_LDADD =							\
 	$(XFCONF_LIBS)							\
 	$(LIBM)
 
-xfce4_session_DEPENDENCIES =						\
-	$(top_builddir)/libxfsm/libxfsm-4.6.la
-
 if HAVE_POLKIT
 
 @INTLTOOL_POLICY_RULE@
diff --git a/xfsm-shutdown-helper/Makefile.am b/xfsm-shutdown-helper/Makefile.am
index f64b5ba..11550cd 100644
--- a/xfsm-shutdown-helper/Makefile.am
+++ b/xfsm-shutdown-helper/Makefile.am
@@ -7,6 +7,7 @@ xfsm_shutdown_helper_SOURCES =						\
 
 xfsm_shutdown_helper_CFLAGS =						\
 	-I$(top_srcdir)							\
+	-I$(top_srcdir)/libxfsm                 \
 	$(LIBXFCE4UTIL_CFLAGS)
 
 xfsm_shutdown_helper_LDFLAGS =						\

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.