From 78cc13b8eb35a3fc02c424ead275fab5908b91e4 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Wed, 5 Jul 2006 19:59:45 +0000
Subject: [PATCH] Add LIBX11_LDFLAGS
(Old svn revision: 22278)
---
mcs-plugin/Makefile.am | 60 +++++++++++++++++++++---------------------
src/Makefile.am | 27 ++++++++++---------
2 files changed, 44 insertions(+), 43 deletions(-)
diff --git a/mcs-plugin/Makefile.am b/mcs-plugin/Makefile.am
index 15903c321..2d2a8e380 100644
--- a/mcs-plugin/Makefile.am
+++ b/mcs-plugin/Makefile.am
@@ -22,10 +22,10 @@ xfwm4_plugin_la_SOURCES = \
xfwm4_shortcuteditor.h
xfwm4_plugin_la_CFLAGS = \
- @LIBX11_CFLAGS@ \
- @LIBXFCE4MCS_MANAGER_CFLAGS@ \
- @LIBXFCEGUI4_CFLAGS@ \
- @XFCE_MCS_MANAGER_CFLAGS@ \
+ $(LIBX11_CFLAGS) \
+ $(LIBXFCE4MCS_MANAGER_CFLAGS) \
+ $(LIBXFCEGUI4_CFLAGS) \
+ $(XFCE_MCS_MANAGER_CFLAGS) \
-I$(top_builddir)/common \
-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
@@ -33,13 +33,13 @@ xfwm4_plugin_la_CFLAGS = \
-DPACKAGE_DATADIR=\"$(pkgdatadir)\"
xfwm4_plugin_la_LIBADD = \
- @LIBXFCEGUI4_LIBS@ \
- @LIBXFCE4MCS_MANAGER_LIBS@ \
- @LIBS@
+ $(LIBXFCEGUI4_LIBS) \
+ $(LIBXFCE4MCS_MANAGER_LIBS) \
+ $(LIBS)
if HAVE_CYGWIN
xfwm4_plugin_la_LIBADD += \
- @LIBX11_LIBS@
+ $(LIBX11_LIBS)
endif
workspaces_plugindir = $(libdir)/xfce4/mcs-plugins
@@ -51,8 +51,8 @@ workspaces_plugin_la_LDFLAGS = \
-module
if HAVE_CYGWIN
-workspaces_plugin_la_LDFLAGS += \
- -no-undefined \
+workspaces_plugin_la_LDFLAGS += \
+ -no-undefined \
-export-symbols $(datadir)/xfce4/devel/mcs-manager.def
endif
@@ -66,23 +66,23 @@ workspaces_plugin_la_SOURCES = \
monitor-icon.h
workspaces_plugin_la_CFLAGS = \
- @LIBX11_CFLAGS@ \
- @LIBXFCE4MCS_MANAGER_CFLAGS@ \
- @LIBXFCEGUI4_CFLAGS@ \
- @XFCE_MCS_MANAGER_CFLAGS@ \
+ $(LIBX11_CFLAGS) \
+ $(LIBXFCE4MCS_MANAGER_CFLAGS) \
+ $(LIBXFCEGUI4_CFLAGS) \
+ $(XFCE_MCS_MANAGER_CFLAGS) \
-I$(top_builddir)/common \
-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DDATADIR=\"$(pkgdatadir)\"
workspaces_plugin_la_LIBADD = \
- @LIBXFCEGUI4_LIBS@ \
- @LIBXFCE4MCS_MANAGER_LIBS@ \
- @LIBS@
+ $(LIBXFCEGUI4_LIBS) \
+ $(LIBXFCE4MCS_MANAGER_LIBS) \
+ $(LIBS)
if HAVE_CYGWIN
-workspaces_plugin_la_LIBADD += \
- @LIBX11_LIBS@
+workspaces_plugin_la_LIBADD += \
+ $(LIBX11_LIBS)
endif
wmtweaks_plugindir = $(libdir)/xfce4/mcs-plugins
@@ -94,8 +94,8 @@ wmtweaks_plugin_la_LDFLAGS = \
-module
if HAVE_CYGWIN
-wmtweaks_plugin_la_LDFLAGS += \
- -no-undefined \
+wmtweaks_plugin_la_LDFLAGS += \
+ -no-undefined \
-export-symbols $(datadir)/xfce4/devel/mcs-manager.def
endif
@@ -103,23 +103,23 @@ wmtweaks_plugin_la_SOURCES = \
wmtweaks_plugin.c
wmtweaks_plugin_la_CFLAGS = \
- @LIBX11_CFLAGS@ \
- @LIBXFCE4MCS_MANAGER_CFLAGS@ \
- @LIBXFCEGUI4_CFLAGS@ \
- @XFCE_MCS_MANAGER_CFLAGS@ \
+ $(LIBX11_CFLAGS) \
+ $(LIBXFCE4MCS_MANAGER_CFLAGS) \
+ $(LIBXFCEGUI4_CFLAGS) \
+ $(XFCE_MCS_MANAGER_CFLAGS) \
-I$(top_builddir)/common \
-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DDATADIR=\"$(pkgdatadir)\"
wmtweaks_plugin_la_LIBADD = \
- @LIBXFCEGUI4_LIBS@ \
- @LIBXFCE4MCS_MANAGER_LIBS@ \
- @LIBS@
+ $(LIBXFCEGUI4_LIBS) \
+ $(LIBXFCE4MCS_MANAGER_LIBS) \
+ $(LIBS)
if HAVE_CYGWIN
-wmtweaks_plugin_la_LIBADD += \
- @LIBX11_LIBS@
+wmtweaks_plugin_la_LIBADD += \
+ $(LIBX11_LIBS)
endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 69fa4238c..90e083dde 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,25 +65,26 @@ xfwm4_SOURCES = \
xpm-color-table.h
xfwm4_CFLAGS = \
- @LIBX11_CFLAGS@ \
- @LIBXFCE4MCS_CLIENT_CFLAGS@ \
- @LIBXFCEGUI4_CFLAGS@ \
- @RENDER_CFLAGS@ \
- @LIBSTARTUP_NOTIFICATION_CFLAGS@ \
- @COMPOSITOR_CFLAGS@ \
+ $(LIBX11_CFLAGS) \
+ $(LIBXFCE4MCS_CLIENT_CFLAGS) \
+ $(LIBXFCEGUI4_CFLAGS) \
+ $(RENDER_CFLAGS) \
+ $(LIBSTARTUP_NOTIFICATION_CFLAGS) \
+ $(COMPOSITOR_CFLAGS) \
-I$(top_builddir)/common \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-DDATADIR=\"$(datadir)\" \
-DPACKAGE_DATADIR=\"$(pkgdatadir)\"
xfwm4_LDADD = \
- @LIBX11_LIBS@ \
- @LIBXFCE4MCS_CLIENT_LIBS@ \
- @LIBXFCEGUI4_LIBS@ \
- @LIBSTARTUP_NOTIFICATION_LIBS@ \
- @RENDER_LIBS@ \
- @COMPOSITOR_LIBS@ \
- @RANDR_LIBS@
+ $(LIBX11_LIBS) \
+ $(LIBX11_LDFLAGS) \
+ $(LIBXFCE4MCS_CLIENT_LIBS) \
+ $(LIBXFCEGUI4_LIBS) \
+ $(LIBSTARTUP_NOTIFICATION_LIBS) \
+ $(RENDER_LIBS) \
+ $(COMPOSITOR_LIBS) \
+ $(RANDR_LIBS)
EXTRA_DIST = inline-tabwin-icon.h tabwin-icon.png \
inline-default-icon.h default_icon.png \
--
GitLab