aboutsummaryrefslogtreecommitdiff
path: root/libX11/modules/lc/xlocale
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-10-18 13:41:37 +0000
committermarha <marha@users.sourceforge.net>2009-10-18 13:41:37 +0000
commit814b98c7e9cde9c8e97b476e6d409bc2607d846c (patch)
tree1a191c9f7bafa0d184aefca0a5b995ad4c4e1fd9 /libX11/modules/lc/xlocale
parent27bc6d5e30150409259aa9030e668e801eb0b5a6 (diff)
parentb567a3027bceabc0f1f42dd162268f06f15e8149 (diff)
downloadvcxsrv-814b98c7e9cde9c8e97b476e6d409bc2607d846c.tar.gz
vcxsrv-814b98c7e9cde9c8e97b476e6d409bc2607d846c.tar.bz2
vcxsrv-814b98c7e9cde9c8e97b476e6d409bc2607d846c.zip
svn merge ^/branches/released
Diffstat (limited to 'libX11/modules/lc/xlocale')
-rw-r--r--libX11/modules/lc/xlocale/Makefile.am8
-rw-r--r--libX11/modules/lc/xlocale/Makefile.in29
2 files changed, 21 insertions, 16 deletions
diff --git a/libX11/modules/lc/xlocale/Makefile.am b/libX11/modules/lc/xlocale/Makefile.am
index be8dd41c1..d48d2e96d 100644
--- a/libX11/modules/lc/xlocale/Makefile.am
+++ b/libX11/modules/lc/xlocale/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS= \
+AM_CPPFLAGS= \
-I$(top_srcdir)/include \
-I$(top_srcdir)/include/X11 \
-I$(top_builddir)/include \
@@ -6,10 +6,12 @@ AM_CFLAGS= \
-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) \
- -D_BSD_SOURCE
+ $(XDMCP_CFLAGS)
if XLIB_LOADABLE_I18N
diff --git a/libX11/modules/lc/xlocale/Makefile.in b/libX11/modules/lc/xlocale/Makefile.in
index 7c947ee43..e22e71dda 100644
--- a/libX11/modules/lc/xlocale/Makefile.in
+++ b/libX11/modules/lc/xlocale/Makefile.in
@@ -135,6 +135,10 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -142,16 +146,18 @@ DOLT_BASH = @DOLT_BASH@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
+ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-FGREP = @FGREP@
+F77 = @F77@
+FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
+GROFF = @GROFF@
I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -160,7 +166,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
LAUNCHD = @LAUNCHD@
-LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -170,7 +175,6 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
LINTLIB = @LINTLIB@
LINT_FLAGS = @LINT_FLAGS@
-LIPO = @LIPO@
LN_S = @LN_S@
LTCOMPILE = @LTCOMPILE@
LTCXXCOMPILE = @LTCXXCOMPILE@
@@ -181,12 +185,8 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
MKDIR_P = @MKDIR_P@
-NM = @NM@
NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -196,6 +196,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
+PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -234,7 +235,8 @@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -266,7 +268,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -282,7 +283,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/include/X11 \
-I$(top_builddir)/include \
@@ -290,10 +291,12 @@ AM_CFLAGS = \
-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) \
- -D_BSD_SOURCE
+ $(XDMCP_CFLAGS)
@XLIB_LOADABLE_I18N_TRUE@commonlibdir = $(X11_LOCALELIBDIR)/common
@XLIB_LOADABLE_I18N_TRUE@commonlib_LTLIBRARIES = xlocale.la