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/im/ximcp/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/im/ximcp/Makefile.am')
-rw-r--r-- | libX11/modules/im/ximcp/Makefile.am | 119 |
1 files changed, 60 insertions, 59 deletions
diff --git a/libX11/modules/im/ximcp/Makefile.am b/libX11/modules/im/ximcp/Makefile.am index 0dc8dfbfb..d696b867c 100644 --- a/libX11/modules/im/ximcp/Makefile.am +++ b/libX11/modules/im/ximcp/Makefile.am @@ -1,59 +1,60 @@ -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 -DXIM_t -DTRANS_CLIENT - -AM_CFLAGS= \ - $(X11_CFLAGS) \ - $(BIGFONT_CFLAGS) \ - $(XDMCP_CFLAGS) \ - $(MALLOC_ZERO_CFLAGS) - -if XLIB_LOADABLE_I18N - -commonlibdir = $(X11_LOCALELIBDIR)/common -commonlib_LTLIBRARIES=ximcp.la -ximcp_la_LDFLAGS = -module -version-number 2:0:0 -ximcp_la_LIBADD = $(I18N_MODULE_LIBS) - -else - -noinst_LTLIBRARIES=libximcp.la - -endif - - -ximcp_la_SOURCES = \ - imCallbk.c \ - imDefFlt.c \ - imDefIc.c \ - imDefIm.c \ - imDefLkup.c \ - imDispch.c \ - imEvToWire.c \ - imExten.c \ - imImSw.c \ - imInsClbk.c \ - imInt.c \ - imLcFlt.c \ - imLcGIc.c \ - imLcIc.c \ - imLcIm.c \ - imLcLkup.c \ - imLcPrs.c \ - imLcSIc.c \ - imRmAttr.c \ - imRm.c \ - imThaiFlt.c \ - imThaiIc.c \ - imThaiIm.c \ - imTrans.c \ - imTransR.c \ - imTrX.c - -libximcp_la_SOURCES = $(ximcp_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 -DXIM_t -DTRANS_CLIENT
+
+AM_CFLAGS= \
+ $(X11_CFLAGS) \
+ $(BIGFONT_CFLAGS) \
+ $(XDMCP_CFLAGS) \
+ $(MALLOC_ZERO_CFLAGS) \
+ $(CWARNFLAGS)
+
+if XLIB_LOADABLE_I18N
+
+commonlibdir = $(X11_LOCALELIBDIR)/common
+commonlib_LTLIBRARIES=ximcp.la
+ximcp_la_LDFLAGS = -module -version-number 2:0:0
+ximcp_la_LIBADD = $(I18N_MODULE_LIBS)
+
+else
+
+noinst_LTLIBRARIES=libximcp.la
+
+endif
+
+
+ximcp_la_SOURCES = \
+ imCallbk.c \
+ imDefFlt.c \
+ imDefIc.c \
+ imDefIm.c \
+ imDefLkup.c \
+ imDispch.c \
+ imEvToWire.c \
+ imExten.c \
+ imImSw.c \
+ imInsClbk.c \
+ imInt.c \
+ imLcFlt.c \
+ imLcGIc.c \
+ imLcIc.c \
+ imLcIm.c \
+ imLcLkup.c \
+ imLcPrs.c \
+ imLcSIc.c \
+ imRmAttr.c \
+ imRm.c \
+ imThaiFlt.c \
+ imThaiIc.c \
+ imThaiIm.c \
+ imTrans.c \
+ imTransR.c \
+ imTrX.c
+
+libximcp_la_SOURCES = $(ximcp_la_SOURCES)
|