147 lines
7.5 KiB
Diff
147 lines
7.5 KiB
Diff
|
Index: fvwm-2.5.26/fvwm/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- fvwm-2.5.26.orig/fvwm/Makefile.am
|
||
|
|
+++ fvwm-2.5.26/fvwm/Makefile.am
|
||
|
|
@@ -35,7 +35,7 @@ LDADD = \
|
||
|
|
-L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS) \
|
||
|
|
$(stroke_LIBS) $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 \
|
||
|
|
$(X_EXTRA_LIBS) -lm $(iconv_LIBS) $(Xrender_LIBS) $(Xcursor_LIBS) \
|
||
|
|
- $(Bidi_LIBS) $(png_LIBS) $(rsvg_LIBS) $(intl_LIBS)
|
||
|
|
+ $(Bidi_LIBS) $(png_LIBS) $(rsvg_LIBS) $(intl_LIBS) -lfontconfig
|
||
|
|
|
||
|
|
INCLUDES = \
|
||
|
|
-I$(top_srcdir) $(stroke_CFLAGS) $(Xft_CFLAGS) \
|
||
|
|
Index: fvwm-2.5.26/modules/FvwmButtons/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- fvwm-2.5.26.orig/modules/FvwmButtons/Makefile.am
|
||
|
|
+++ fvwm-2.5.26/modules/FvwmButtons/Makefile.am
|
||
|
|
@@ -22,7 +22,7 @@ FvwmButtons_DEPENDENCIES = $(top_builddi
|
||
|
|
LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS) \
|
||
|
|
$(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 -lm $(X_EXTRA_LIBS) \
|
||
|
|
$(iconv_LIBS) $(Xrender_LIBS) $(Xcursor_LIBS) $(Bidi_LIBS) \
|
||
|
|
- $(png_LIBS) $(rsvg_LIBS)
|
||
|
|
+ $(png_LIBS) $(rsvg_LIBS) -lfontconfig
|
||
|
|
|
||
|
|
INCLUDES = -I$(top_srcdir) $(xpm_CFLAGS) $(Xft_CFLAGS) $(X_CFLAGS) \
|
||
|
|
$(iconv_CFLAGS) $(Xrender_CFLAGS) $(fribidi_CFLAGS) $(png_CFLAGS)
|
||
|
|
Index: fvwm-2.5.26/modules/FvwmForm/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- fvwm-2.5.26.orig/modules/FvwmForm/Makefile.am
|
||
|
|
+++ fvwm-2.5.26/modules/FvwmForm/Makefile.am
|
||
|
|
@@ -45,7 +45,8 @@ config_DATA = \
|
||
|
|
## so we might as well link against libXpm, if present.
|
||
|
|
LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) \
|
||
|
|
$(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 $(X_EXTRA_LIBS) \
|
||
|
|
- -lm $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS)
|
||
|
|
+ -lm $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS) \
|
||
|
|
+ -lfontconfig
|
||
|
|
|
||
|
|
INCLUDES = -I$(top_srcdir) $(Xft_CFLAGS) $(X_CFLAGS) $(iconv_CFLAGS) \
|
||
|
|
$(Bidi_CFLAGS) $(Xrender_CFLAGS)
|
||
|
|
Index: fvwm-2.5.26/modules/FvwmIconBox/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- fvwm-2.5.26.orig/modules/FvwmIconBox/Makefile.am
|
||
|
|
+++ fvwm-2.5.26/modules/FvwmIconBox/Makefile.am
|
||
|
|
@@ -19,7 +19,7 @@ FvwmIconBox_DEPENDENCIES = $(top_builddi
|
||
|
|
LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS) \
|
||
|
|
$(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 -lm $(X_EXTRA_LIBS) \
|
||
|
|
$(iconv_LIBS) $(Xrender_LIBS) $(Xcursor_LIBS) $(Bidi_LIBS) \
|
||
|
|
- $(png_LIBS) $(rsvg_LIBS)
|
||
|
|
+ $(png_LIBS) $(rsvg_LIBS) -lfontconfig
|
||
|
|
|
||
|
|
INCLUDES = -I$(top_srcdir) $(Xft_CFLAGS) $(xpm_CFLAGS) $(X_CFLAGS) \
|
||
|
|
$(iconv_CFLAGS) $(Xrender_CFLAGS) $(Bidi_CFLAGS) $(png_CFLAGS)
|
||
|
|
Index: fvwm-2.5.26/modules/FvwmIconMan/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- fvwm-2.5.26.orig/modules/FvwmIconMan/Makefile.am
|
||
|
|
+++ fvwm-2.5.26/modules/FvwmIconMan/Makefile.am
|
||
|
|
@@ -21,7 +21,8 @@ FvwmIconMan_DEPENDENCIES = $(top_builddi
|
||
|
|
## so we might as well link against libXpm, if present.
|
||
|
|
LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) \
|
||
|
|
$(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 $(X_EXTRA_LIBS) \
|
||
|
|
- $(iconv_LIBS) $(Xrender_LIBS) $(rsvg_LIBS) -lm $(Bidi_LIBS)
|
||
|
|
+ $(iconv_LIBS) $(Xrender_LIBS) $(rsvg_LIBS) -lm $(Bidi_LIBS) \
|
||
|
|
+ -lfontconfig
|
||
|
|
|
||
|
|
INCLUDES = -I$(top_srcdir) $(Xft_CFLAGS) $(X_CFLAGS) \
|
||
|
|
$(iconv_CFLAGS) $(Xrender_CFLAGS) $(Bidi_CFLAGS)
|
||
|
|
Index: fvwm-2.5.26/modules/FvwmIdent/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- fvwm-2.5.26.orig/modules/FvwmIdent/Makefile.am
|
||
|
|
+++ fvwm-2.5.26/modules/FvwmIdent/Makefile.am
|
||
|
|
@@ -18,7 +18,8 @@ FvwmIdent_DEPENDENCIES = $(top_builddir)
|
||
|
|
## so we might as well link against libXpm, if present.
|
||
|
|
LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS) \
|
||
|
|
$(png_LIBS) $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 -lm \
|
||
|
|
- $(X_EXTRA_LIBS) $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS)
|
||
|
|
+ $(X_EXTRA_LIBS) $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS) \
|
||
|
|
+ -lfontconfig
|
||
|
|
|
||
|
|
INCLUDES = -I$(top_srcdir) $(Xft_CFLAGS) $(xpm_CFLAGS) $(png_CFLAGS) \
|
||
|
|
$(X_CFLAGS) $(Xrender_CFLAGS) $(iconv_CFLAGS) $(Bidi_CFLAGS)
|
||
|
|
Index: fvwm-2.5.26/modules/FvwmPager/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- fvwm-2.5.26.orig/modules/FvwmPager/Makefile.am
|
||
|
|
+++ fvwm-2.5.26/modules/FvwmPager/Makefile.am
|
||
|
|
@@ -19,7 +19,7 @@ FvwmPager_DEPENDENCIES = $(top_builddir)
|
||
|
|
LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS) \
|
||
|
|
$(png_LIBS) $(rsvg_LIBS) $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 \
|
||
|
|
$(X_EXTRA_LIBS) -lm $(Xrender_LIBS) $(Xcursor_LIBS) $(iconv_LIBS) \
|
||
|
|
- $(Bidi_LIBS)
|
||
|
|
+ $(Bidi_LIBS) -lfontconfig
|
||
|
|
|
||
|
|
INCLUDES = -I$(top_srcdir) $(xpm_CFLAGS) $(png_CFLAGS) $(Xft_CFLAGS) \
|
||
|
|
$(X_CFLAGS) $(Xrender_CFLAGS) $(iconv_CFLAGS) $(Bidi_CFLAGS)
|
||
|
|
Index: fvwm-2.5.26/modules/FvwmProxy/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- fvwm-2.5.26.orig/modules/FvwmProxy/Makefile.am
|
||
|
|
+++ fvwm-2.5.26/modules/FvwmProxy/Makefile.am
|
||
|
|
@@ -19,7 +19,7 @@ FvwmProxy_DEPENDENCIES = $(top_builddir)
|
||
|
|
LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS) \
|
||
|
|
$(png_LIBS) $(rsvg_LIBS) $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 \
|
||
|
|
$(X_EXTRA_LIBS) -lm $(Xrender_LIBS) $(Xcursor_LIBS) $(iconv_LIBS) \
|
||
|
|
- $(Bidi_LIBS)
|
||
|
|
+ $(Bidi_LIBS) -lfontconfig
|
||
|
|
|
||
|
|
INCLUDES = -I$(top_srcdir) $(xpm_CFLAGS) $(png_CFLAGS) $(Xft_CFLAGS) \
|
||
|
|
$(X_CFLAGS) $(Xrender_CFLAGS) $(iconv_CFLAGS) $(Bidi_CFLAGS)
|
||
|
|
Index: fvwm-2.5.26/modules/FvwmScript/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- fvwm-2.5.26.orig/modules/FvwmScript/Makefile.am
|
||
|
|
+++ fvwm-2.5.26/modules/FvwmScript/Makefile.am
|
||
|
|
@@ -19,7 +19,7 @@ EXTRA_DIST = $(man_MANS) scanner.l scrip
|
||
|
|
LDADD = Widgets/libWidgets.a -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) \
|
||
|
|
$(X_LIBS) $(xpm_LIBS) $(Xinerama_LIBS) $(X_PRE_LIBS) -lXext -lX11 \
|
||
|
|
$(X_EXTRA_LIBS) -lm $(Xrender_LIBS) $(Xcursor_LIBS) $(iconv_LIBS) \
|
||
|
|
- $(Bidi_LIBS) $(png_LIBS) $(rsvg_LIBS) $(intl_LIBS)
|
||
|
|
+ $(Bidi_LIBS) $(png_LIBS) $(rsvg_LIBS) $(intl_LIBS) -lfontconfig
|
||
|
|
|
||
|
|
INCLUDES = -I$(top_srcdir) $(xpm_CFLAGS) $(Xft_CFLAGS) $(X_CFLAGS) \
|
||
|
|
$(Xrender_CFLAGS) $(iconv_CFLAGS) $(Bidi_CFLAGS) $(png_CFLAGS)
|
||
|
|
Index: fvwm-2.5.26/modules/FvwmTaskBar/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- fvwm-2.5.26.orig/modules/FvwmTaskBar/Makefile.am
|
||
|
|
+++ fvwm-2.5.26/modules/FvwmTaskBar/Makefile.am
|
||
|
|
@@ -20,7 +20,7 @@ config_DATA = \
|
||
|
|
LDADD = -L$(top_builddir)/libs $(X_LIBS) -lfvwm -lm $(xpm_LIBS) $(png_LIBS) \
|
||
|
|
$(rsvg_LIBS) $(Xft_LIBS) $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 \
|
||
|
|
$(X_EXTRA_LIBS) $(Xrender_LIBS) $(Xcursor_LIBS) $(iconv_LIBS) \
|
||
|
|
- $(Bidi_LIBS) $(intl_LIBS)
|
||
|
|
+ $(Bidi_LIBS) $(intl_LIBS) -lfontconfig
|
||
|
|
|
||
|
|
INCLUDES = -I$(top_srcdir) $(xpm_CFLAGS) $(png_CFLAGS) $(Xft_CFLAGS) \
|
||
|
|
$(X_CFLAGS) $(Xrender_CFLAGS) $(iconv_CFLAGS) $(Bidi_CFLAGS) \
|
||
|
|
Index: fvwm-2.5.26/modules/FvwmWinList/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- fvwm-2.5.26.orig/modules/FvwmWinList/Makefile.am
|
||
|
|
+++ fvwm-2.5.26/modules/FvwmWinList/Makefile.am
|
||
|
|
@@ -20,7 +20,7 @@ FvwmWinList_DEPENDENCIES = $(top_builddi
|
||
|
|
## so we might as well link against libXpm, if present.
|
||
|
|
LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) \
|
||
|
|
$(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 -lm $(X_EXTRA_LIBS) \
|
||
|
|
- $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS)
|
||
|
|
+ $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS) -lfontconfig
|
||
|
|
|
||
|
|
INCLUDES = -I$(top_srcdir) $(Xft_CFLAGS) $(X_CFLAGS) $(Xrender_CFLAGS) \
|
||
|
|
$(iconv_CFLAGS) $(Bidi_CFLAGS)
|