diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-22 08:56:07 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-22 08:56:07 +0000 |
| commit | 4e512860d6f0a7644ae3872d91edafa9040f608a (patch) | |
| tree | ceadfe99e76c6f2f155d8ad09c8b98f57ca6400c /libX11/nls/makefile | |
| parent | f5d19a3432c13e7b3262b3771468cc42e25d2e8c (diff) | |
| parent | 6a14682c40a85bbfdb5023a3330e95a3a3c0ad03 (diff) | |
| download | vcxsrv-4e512860d6f0a7644ae3872d91edafa9040f608a.tar.gz vcxsrv-4e512860d6f0a7644ae3872d91edafa9040f608a.tar.bz2 vcxsrv-4e512860d6f0a7644ae3872d91edafa9040f608a.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libX11/nls/makefile')
| -rw-r--r-- | libX11/nls/makefile | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/libX11/nls/makefile b/libX11/nls/makefile index c38c8fd4e..e6bf47297 100644 --- a/libX11/nls/makefile +++ b/libX11/nls/makefile @@ -1,4 +1,8 @@ -SUBDIRS= \
+X11_LOCALEDATADIR = ..\..\xorg-server\locale
+
+x11localedir = $(X11_LOCALEDATADIR)
+x11locale_DATA = locale.alias locale.dir compose.dir
+locales = \
am_ET.UTF-8 \
armscii-8 \
C \
@@ -60,29 +64,22 @@ SUBDIRS= \ zh_TW.big5 \
zh_TW.UTF-8
-CPP_FILES_FLAGS = -DWCHAR32=@WCHAR32@
+include ../cpprules.mak
-X11_LOCALEDATADIR = ..\..\xorg-server\locale
-$(X11_LOCALEDATADIR)\locale.alias: locale.alias.pre
- cl /nologo /EP $< -DXCOMM\#\# > locale.alias.l1
- sed -e "/^[^\#][^ ]*:/s/://" -e "/^[^\#].*[ ].*:/d" < locale.alias.l1 > locale.alias.l2
- type locale.alias.l2 locale.alias.l1 > $@
- del locale.alias.l1
- del locale.alias.l2
+$(X11_LOCALEDATADIR)\%: %.pre
+ cl /nologo /EP $< -DXCOMM\#\# > $<.l1
+ sed -e "/^[^\#][^ ]*:/s/://" -e "/^[^\#].*[ ].*:/d" < $<.l1 > $<.l2
+ type $<.l2 $<.l1 > $@
+ del $<.l1
+ del $<.l2
+
+# Per-locale data files
+
+nobase_dist_x11locale_DATA = $(locales:%=%\XI18N_OBJS)
-$(X11_LOCALEDATADIR)\compose.dir: compose.dir.pre
- cl /nologo /EP $< -DXCOMM\#\# > compose.dir.l1
- sed -e "/^[^\#][^ ]*:/s/://" -e "/^[^\#].*[ ].*:/d" < compose.dir.l1 > compose.dir.l2
- type compose.dir.l2 compose.dir.l1 > $@
- del compose.dir.l1
- del compose.dir.l2
+nobase_x11locale_DATA = $(locales:%=%\XLC_LOCALE) $(locales:%=%\Compose)
-$(X11_LOCALEDATADIR)\locale.dir: locale.dir.pre
- cl /nologo /EP $< -DXCOMM\#\# > locale.dir.l1
- sed -e "/^[^\#][^ ]*:/s/://" -e "/^[^\#].*[ ].*:/d" < locale.dir.l1 > locale.dir.l2
- type locale.dir.l2 locale.dir.l1 > $@
- del locale.dir.l1
- del locale.dir.l2
+all_DATA = $(nobase_dist_x11locale_DATA) $(nobase_x11locale_DATA) $(x11locale_DATA)
-all: $(X11_LOCALEDATADIR)\locale.alias $(X11_LOCALEDATADIR)\compose.dir $(X11_LOCALEDATADIR)\locale.dir
+all: $(all_DATA:%=$(X11_LOCALEDATADIR)\%)
|