diff options
| author | Olivier Duchateau <duchateau.olivier@gmail.com> | 2019-05-19 16:24:29 +0200 |
|---|---|---|
| committer | Romain Bouvier <skunnyk@alteroot.org> | 2019-07-04 14:04:30 +0200 |
| commit | a4e499e23ade4f019f56fde944c90f1eb284219b (patch) | |
| tree | 72c474ae1cbd7ca9cc60d45bf86f22c51d67368a /libxfsm | |
| parent | f2096dd4fef17ef9423f0fe6116309d59812f9c1 (diff) | |
| download | xfce4-session-a4e499e23ade4f019f56fde944c90f1eb284219b.tar.gz | |
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
Diffstat (limited to 'libxfsm')
| -rw-r--r-- | libxfsm/Makefile.am | 26 | ||||
| -rw-r--r-- | libxfsm/xfce4-session-2.0.pc.in | 11 |
2 files changed, 8 insertions, 29 deletions
diff --git a/libxfsm/Makefile.am b/libxfsm/Makefile.am index 1b61dca6..0de02611 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 f11af051..00000000 --- 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 |