diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-25 12:10:25 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-25 12:10:25 +0100 |
| commit | 0f333fb1102f4886a8ce39f3c09b12e89e5a7f19 (patch) | |
| tree | 8239768e506a03837019c4f02c8ab949c04a0818 /libX11/src/xlibi18n/makefile | |
| parent | 7dbaa1cffdf176f803f2c7069fb6810e16a86f72 (diff) | |
| parent | a473b885d641b9c1ea57f2ae53f9ba7f2958cce2 (diff) | |
| download | vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.tar.gz vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.tar.bz2 vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 xserver mesa libXinerama libXmu mkfontscale git update 25 nov 2013
Conflicts:
libXinerama/src/Xinerama.c
Diffstat (limited to 'libX11/src/xlibi18n/makefile')
| -rwxr-xr-x[-rw-r--r--] | libX11/src/xlibi18n/makefile | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/libX11/src/xlibi18n/makefile b/libX11/src/xlibi18n/makefile index ec9b946b8..01fcfa26d 100644..100755 --- a/libX11/src/xlibi18n/makefile +++ b/libX11/src/xlibi18n/makefile @@ -1,48 +1,5 @@ -#AM_CFLAGS= \ -# -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 \ -# $(X11_CFLAGS) \ -# $(BIGFONT_CFLAGS) \ -# $(XDMCP_CFLAGS) \ -# -D_BSD_SOURCE \ -# $(XMALLOC_ZERO_CFLAGS) - LIBRARY = libi18n - -# -# Dynamic loading code for i18n modules -# -#if XLIB_LOADABLE_I18N -#XI18N_DL_SOURCES = \ -# XlcDL.c \ -# XlcSL.c -#else -# -# Static interfaces to input/output methods -# -#IM_LIBS = \ -# ${top_builddir}/modules/im/ximcp/libximcp.la - -#LC_LIBS = \ -# ${top_builddir}/modules/lc/def/libxlcDef.la \ -# ${top_builddir}/modules/lc/gen/libxlibi18n.la \ -# ${top_builddir}/modules/lc/Utf8/libxlcUTF8Load.la \ -# ${top_builddir}/modules/lc/xlocale/libxlocale.la - -#OM_LIBS = \ -# ${top_builddir}/modules/om/generic/libxomGeneric.la -#endif - -#libi18n_la_LIBADD = \ -# $(IM_LIBS) $(LC_LIBS) $(OM_LIBS) - INCLUDES += ..\..\include\X11 .. DEFINES += XLOCALELIBDIR="\".\"" LIB11_DLL |