aboutsummaryrefslogtreecommitdiff
path: root/libX11/modules/lc/xlocale/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-19 10:32:31 +0000
committermarha <marha@users.sourceforge.net>2010-05-19 10:32:31 +0000
commitb16c0295c9f95426980d567e93ae00c52545b3fa (patch)
treed25e3271be998e47e0ff07048d8297001409ea5f /libX11/modules/lc/xlocale/Makefile.am
parentc1b8f2475ebdeb148f4a27b78ed3cb24c68a92c4 (diff)
parent153f5cafa19da4e4c0cf21e9c909958359ed8ebd (diff)
downloadvcxsrv-b16c0295c9f95426980d567e93ae00c52545b3fa.tar.gz
vcxsrv-b16c0295c9f95426980d567e93ae00c52545b3fa.tar.bz2
vcxsrv-b16c0295c9f95426980d567e93ae00c52545b3fa.zip
svn merge "^/branches/released" .
Diffstat (limited to 'libX11/modules/lc/xlocale/Makefile.am')
-rw-r--r--libX11/modules/lc/xlocale/Makefile.am71
1 files changed, 36 insertions, 35 deletions
diff --git a/libX11/modules/lc/xlocale/Makefile.am b/libX11/modules/lc/xlocale/Makefile.am
index d48d2e96d..07fbd8052 100644
--- a/libX11/modules/lc/xlocale/Makefile.am
+++ b/libX11/modules/lc/xlocale/Makefile.am
@@ -1,35 +1,36 @@
-AM_CPPFLAGS= \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/include/X11 \
- -I$(top_builddir)/include \
- -I$(top_builddir)/include/X11 \
- -I$(top_srcdir)/src/xcms \
- -I$(top_srcdir)/src/xkb \
- -I$(top_srcdir)/src/xlibi18n \
- -D_BSD_SOURCE
-
-AM_CFLAGS= \
- $(X11_CFLAGS) \
- $(BIGFONT_CFLAGS) \
- $(XDMCP_CFLAGS)
-
-if XLIB_LOADABLE_I18N
-
-commonlibdir = $(X11_LOCALELIBDIR)/common
-commonlib_LTLIBRARIES=xlocale.la
-xlocale_la_LDFLAGS = -module -version-number 2:0:0
-xlocale_la_LIBADD = $(I18N_MODULE_LIBS)
-
-else
-
-noinst_LTLIBRARIES = libxlocale.la
-
-endif
-
-
-xlocale_la_SOURCES = \
- lcEuc.c \
- lcJis.c \
- lcSjis.c
-
-libxlocale_la_SOURCES = $(xlocale_la_SOURCES)
+AM_CPPFLAGS= \
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir)/include/X11 \
+ -I$(top_builddir)/include \
+ -I$(top_builddir)/include/X11 \
+ -I$(top_srcdir)/src/xcms \
+ -I$(top_srcdir)/src/xkb \
+ -I$(top_srcdir)/src/xlibi18n \
+ -D_BSD_SOURCE
+
+AM_CFLAGS= \
+ $(X11_CFLAGS) \
+ $(BIGFONT_CFLAGS) \
+ $(XDMCP_CFLAGS) \
+ $(CWARNFLAGS)
+
+if XLIB_LOADABLE_I18N
+
+commonlibdir = $(X11_LOCALELIBDIR)/common
+commonlib_LTLIBRARIES=xlocale.la
+xlocale_la_LDFLAGS = -module -version-number 2:0:0
+xlocale_la_LIBADD = $(I18N_MODULE_LIBS)
+
+else
+
+noinst_LTLIBRARIES = libxlocale.la
+
+endif
+
+
+xlocale_la_SOURCES = \
+ lcEuc.c \
+ lcJis.c \
+ lcSjis.c
+
+libxlocale_la_SOURCES = $(xlocale_la_SOURCES)