diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-19 10:32:31 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-19 10:32:31 +0000 |
| commit | b16c0295c9f95426980d567e93ae00c52545b3fa (patch) | |
| tree | d25e3271be998e47e0ff07048d8297001409ea5f /libX11/modules/om/generic/Makefile.am | |
| parent | c1b8f2475ebdeb148f4a27b78ed3cb24c68a92c4 (diff) | |
| parent | 153f5cafa19da4e4c0cf21e9c909958359ed8ebd (diff) | |
| download | vcxsrv-b16c0295c9f95426980d567e93ae00c52545b3fa.tar.gz vcxsrv-b16c0295c9f95426980d567e93ae00c52545b3fa.tar.bz2 vcxsrv-b16c0295c9f95426980d567e93ae00c52545b3fa.zip | |
svn merge "^/branches/released" .
Diffstat (limited to 'libX11/modules/om/generic/Makefile.am')
| -rw-r--r-- | libX11/modules/om/generic/Makefile.am | 85 |
1 files changed, 43 insertions, 42 deletions
diff --git a/libX11/modules/om/generic/Makefile.am b/libX11/modules/om/generic/Makefile.am index f153b8b98..9076edb48 100644 --- a/libX11/modules/om/generic/Makefile.am +++ b/libX11/modules/om/generic/Makefile.am @@ -1,42 +1,43 @@ -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 \ - -I$(top_srcdir)/src \ - -D_BSD_SOURCE - -AM_CFLAGS= \ - $(X11_CFLAGS) \ - $(BIGFONT_CFLAGS) \ - $(XDMCP_CFLAGS) \ - $(MALLOC_ZERO_CFLAGS) - -if XLIB_LOADABLE_I18N - -commonlibdir = $(X11_LOCALELIBDIR)/common -commonlib_LTLIBRARIES=xomGeneric.la -xomGeneric_la_LDFLAGS = -module -version-number 2:0:0 -xomGeneric_la_LIBADD = $(I18N_MODULE_LIBS) - -else - -noinst_LTLIBRARIES = libxomGeneric.la - -endif - - -xomGeneric_la_SOURCES = \ - omDefault.c \ - omGeneric.c \ - omImText.c \ - omText.c \ - omTextEsc.c \ - omTextExt.c \ - omTextPer.c \ - omXChar.c - -libxomGeneric_la_SOURCES = $(xomGeneric_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 \
+ -I$(top_srcdir)/src \
+ -D_BSD_SOURCE
+
+AM_CFLAGS= \
+ $(X11_CFLAGS) \
+ $(BIGFONT_CFLAGS) \
+ $(XDMCP_CFLAGS) \
+ $(MALLOC_ZERO_CFLAGS) \
+ $(CWARNFLAGS)
+
+if XLIB_LOADABLE_I18N
+
+commonlibdir = $(X11_LOCALELIBDIR)/common
+commonlib_LTLIBRARIES=xomGeneric.la
+xomGeneric_la_LDFLAGS = -module -version-number 2:0:0
+xomGeneric_la_LIBADD = $(I18N_MODULE_LIBS)
+
+else
+
+noinst_LTLIBRARIES = libxomGeneric.la
+
+endif
+
+
+xomGeneric_la_SOURCES = \
+ omDefault.c \
+ omGeneric.c \
+ omImText.c \
+ omText.c \
+ omTextEsc.c \
+ omTextExt.c \
+ omTextPer.c \
+ omXChar.c
+
+libxomGeneric_la_SOURCES = $(xomGeneric_la_SOURCES)
|