summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog8
-rw-r--r--nls/C/Makefile.am4
-rw-r--r--nls/Makefile.am7
-rw-r--r--nls/iscii-dev/Makefile.am2
-rw-r--r--nls/isiri-3342/Makefile.am2
-rw-r--r--nls/iso8859-11/Makefile.am2
-rw-r--r--nls/ja.S90/Makefile.am2
-rw-r--r--nls/ja.U90/Makefile.am2
-rw-r--r--nls/ja_JP.UTF-8/Makefile.am2
-rw-r--r--nls/ko_KR.UTF-8/Makefile.am2
-rw-r--r--nls/microsoft-cp1251/Makefile.am2
-rw-r--r--nls/microsoft-cp1255/Makefile.am2
-rw-r--r--nls/microsoft-cp1256/Makefile.am2
-rw-r--r--nls/nokhchi-1/Makefile.am2
-rw-r--r--nls/tatar-cyr/Makefile.am2
-rw-r--r--nls/th_TH.UTF-8/Makefile.am2
-rw-r--r--nls/th_TH/Makefile.am2
-rw-r--r--nls/tscii-0/Makefile.am2
-rw-r--r--nls/zh_CN.UTF-8/Makefile.am2
-rw-r--r--nls/zh_CN/Makefile.am2
-rw-r--r--nls/zh_HK.UTF-8/Makefile.am2
-rw-r--r--nls/zh_TW.UTF-8/Makefile.am2
-rw-r--r--src/Makefile.am9
23 files changed, 37 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog
index 524790ef..879c8834 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-22 Theo van Klaveren <t.vanklaveren@student.utwente.nl>
+
+ Fix make distcheck.
+
+ * nls/Makefile.am: Also dist compose.dir.pre, clean some more files.
+ * nls/*/Makefile.am: Fix builddir != srcdir builds.
+ * src/Makefile.am: Remove some non-existant files.
+
2005-06-15 Daniel Stone <daniel@freedesktop.org>
* configure.ac:
diff --git a/nls/C/Makefile.am b/nls/C/Makefile.am
index 89c2b75c..328458ad 100644
--- a/nls/C/Makefile.am
+++ b/nls/C/Makefile.am
@@ -10,9 +10,9 @@ XLC_LOCALE: XLC_LOCALE.pre
$(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $(srcdir)/XLC_LOCALE.pre > $@
Compose: Compose.pre
- $(CPP) -traditional -DXCOMM='#' - < Compose.pre > $@
+ $(CPP) -traditional -DXCOMM='#' - < $(srcdir)/Compose.pre > $@
Compose.pre:
- touch Compose.pre
+ touch Compose.pre
DISTCLEANFILES=XLC_LOCALE Compose
diff --git a/nls/Makefile.am b/nls/Makefile.am
index cdf80b35..0945e34d 100644
--- a/nls/Makefile.am
+++ b/nls/Makefile.am
@@ -1,11 +1,14 @@
x11localedir = @X11_LOCALEDIR@
-EXTRA_DIST = locale.alias.pre
+EXTRA_DIST = locale.alias.pre compose.dir.pre
dist_x11locale_DATA=locale.dir compose.dir
x11locale_DATA=locale.alias
-DISTCLEANFILES=locale.alias XLC_LOCALE
+DISTCLEANFILES= \
+ locale.alias locale.alias.l1 \
+ compose.dir compose.dir.l1 \
+ XLC_LOCALE
SUBDIRS= \
armscii-8 \
diff --git a/nls/iscii-dev/Makefile.am b/nls/iscii-dev/Makefile.am
index 89c2b75c..cd29118e 100644
--- a/nls/iscii-dev/Makefile.am
+++ b/nls/iscii-dev/Makefile.am
@@ -10,7 +10,7 @@ XLC_LOCALE: XLC_LOCALE.pre
$(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $(srcdir)/XLC_LOCALE.pre > $@
Compose: Compose.pre
- $(CPP) -traditional -DXCOMM='#' - < Compose.pre > $@
+ $(CPP) -traditional -DXCOMM='#' - < $(srcdir)/Compose.pre > $@
Compose.pre:
touch Compose.pre
diff --git a/nls/isiri-3342/Makefile.am b/nls/isiri-3342/Makefile.am
index 89c2b75c..cd29118e 100644
--- a/nls/isiri-3342/Makefile.am
+++ b/nls/isiri-3342/Makefile.am
@@ -10,7 +10,7 @@ XLC_LOCALE: XLC_LOCALE.pre
$(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $(srcdir)/XLC_LOCALE.pre > $@
Compose: Compose.pre
- $(CPP) -traditional -DXCOMM='#' - < Compose.pre > $@
+ $(CPP) -traditional -DXCOMM='#' - < $(srcdir)/Compose.pre > $@
Compose.pre:
touch Compose.pre
diff --git a/nls/iso8859-11/Makefile.am b/nls/iso8859-11/Makefile.am
index 89c2b75c..cd29118e 100644
--- a/nls/iso8859-11/Makefile.am
+++ b/nls/iso8859-11/Makefile.am
@@ -10,7 +10,7 @@ XLC_LOCALE: XLC_LOCALE.pre
$(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $(srcdir)/XLC_LOCALE.pre > $@
Compose: Compose.pre
- $(CPP) -traditional -DXCOMM='#' - < Compose.pre > $@
+ $(CPP) -traditional -DXCOMM='#' - < $(srcdir)/Compose.pre > $@
Compose.pre:
touch Compose.pre
diff --git a/nls/ja.S90/Makefile.am b/nls/ja.S90/Makefile.am
index 89c2b75c..cd29118e 100644
--- a/nls/ja.S90/Makefile.am
+++ b/nls/ja.S90/Makefile.am
@@ -10,7 +10,7 @@ XLC_LOCALE: XLC_LOCALE.pre
$(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $(srcdir)/XLC_LOCALE.pre > $@
Compose: Compose.pre
- $(CPP) -traditional -DXCOMM='#' - < Compose.pre > $@
+ $(CPP) -traditional -DXCOMM='#' - < $(srcdir)/Compose.pre > $@
Compose.pre:
touch Compose.pre
diff --git a/nls/ja.U90/Makefile.am b/nls/ja.U90/Makefile.am
index 89c2b75c..cd29118e 100644
--- a/nls/ja.U90/Makefile.am
+++ b/nls/ja.U90/Makefile.am
@@ -10,7 +10,7 @@ XLC_LOCALE: XLC_LOCALE.pre
$(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $(srcdir)/XLC_LOCALE.pre > $@
Compose: Compose.pre
- $(CPP) -traditional -DXCOMM='#' - < Compose.pre > $@
+ $(CPP) -traditional -DXCOMM='#' - < $(srcdir)/Compose.pre > $@
Compose.pre:
touch Compose.pre
diff --git a/nls/ja_JP.UTF-8/Makefile.am b/nls/ja_JP.UTF-8/Makefile.am
index 89c2b75c..cd29118e 100644
--- a/nls/ja_JP.UTF-8/Makefile.am
+++ b/nls/ja_JP.UTF-8/Makefile.am
@@ -10,7 +10,7 @@ XLC_LOCALE: XLC_LOCALE.pre
$(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $(srcdir)/XLC_LOCALE.pre > $@
Compose: Compose.pre
- $(CPP) -traditional -DXCOMM='#' - < Compose.pre > $@
+ $(CPP) -traditional -DXCOMM='#' - < $(srcdir)/Compose.pre > $@
Compose.pre:
touch Compose.pre
diff --git a/nls/ko_KR.UTF-8/Makefile.am b/nls/ko_KR.UTF-8/Makefile.am
index 89c2b75c..cd29118e 100644
--- a/nls/ko_KR.UTF-8/Makefile.am
+++ b/nls/ko_KR.UTF-8/Makefile.am
@@ -10,7 +10,7 @@ XLC_LOCALE: XLC_LOCALE.pre
$(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $(srcdir)/XLC_LOCALE.pre > $@
Compose: Compose.pre
- $(CPP) -traditional -DXCOMM='#' - < Compose.pre > $@
+ $(CPP) -traditional -DXCOMM='#' - < $(srcdir)/Compose.pre > $@
Compose.pre:
touch Compose.pre
diff --git a/nls/microsoft-cp1251/Makefile.am b/nls/microsoft-cp1251/Makefile.am
index 89c2b75c..cd29118e 100644
--- a/nls/microsoft-cp1251/Makefile.am
+++ b/nls/microsoft-cp1251/Makefile.am
@@ -10,7 +10,7 @@ XLC_LOCALE: XLC_LOCALE.pre
$(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $(srcdir)/XLC_LOCALE.pre > $@
Compose: Compose.pre
- $(CPP) -traditional -DXCOMM='#' - < Compose.pre > $@
+ $(CPP) -traditional -DXCOMM='#' - < $(srcdir)/Compose.pre > $@
Compose.pre:
touch Compose.pre
diff --git a/nls/microsoft-cp1255/Makefile.am b/nls/microsoft-cp1255/Makefile.am
index 89c2b75c..cd29118e 100644
--- a/nls/microsoft-cp1255/Makefile.am
+++ b/nls/microsoft-cp1255/Makefile.am
@@ -10,7 +10,7 @@ XLC_LOCALE: XLC_LOCALE.pre
$(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $(srcdir)/XLC_LOCALE.pre > $@
Compose: Compose.pre
- $(CPP) -traditional -DXCOMM='#' - < Compose.pre > $@
+ $(CPP) -traditional -DXCOMM='#' - < $(srcdir)/Compose.pre > $@
Compose.pre:
touch Compose.pre
diff --git a/nls/microsoft-cp1256/Makefile.am b/nls/microsoft-cp1256/Makefile.am
index 89c2b75c..cd29118e 100644
--- a/nls/microsoft-cp1256/Makefile.am
+++ b/nls/microsoft-cp1256/Makefile.am
@@ -10,7 +10,7 @@ XLC_LOCALE: XLC_LOCALE.pre
$(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $(srcdir)/XLC_LOCALE.pre > $@
Compose: Compose.pre
- $(CPP) -traditional -DXCOMM='#' - < Compose.pre > $@
+ $(CPP) -traditional -DXCOMM='#' - < $(srcdir)/Compose.pre > $@
Compose.pre:
touch Compose.pre
diff --git a/nls/nokhchi-1/Makefile.am b/nls/nokhchi-1/Makefile.am
index 89c2b75c..cd29118e 100644
--- a/nls/nokhchi-1/Makefile.am
+++ b/nls/nokhchi-1/Makefile.am
@@ -10,7 +10,7 @@ XLC_LOCALE: XLC_LOCALE.pre
$(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $(srcdir)/XLC_LOCALE.pre > $@
Compose: Compose.pre
- $(CPP) -traditional -DXCOMM='#' - < Compose.pre > $@
+ $(CPP) -traditional -DXCOMM='#' - < $(srcdir)/Compose.pre > $@
Compose.pre:
touch Compose.pre
diff --git a/nls/tatar-cyr/Makefile.am b/nls/tatar-cyr/Makefile.am
index 89c2b75c..cd29118e 100644
--- a/nls/tatar-cyr/Makefile.am
+++ b/nls/tatar-cyr/Makefile.am
@@ -10,7 +10,7 @@ XLC_LOCALE: XLC_LOCALE.pre
$(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $(srcdir)/XLC_LOCALE.pre > $@
Compose: Compose.pre
- $(CPP) -traditional -DXCOMM='#' - < Compose.pre > $@
+ $(CPP) -traditional -DXCOMM='#' - < $(srcdir)/Compose.pre > $@
Compose.pre:
touch Compose.pre
diff --git a/nls/th_TH.UTF-8/Makefile.am b/nls/th_TH.UTF-8/Makefile.am
index 89c2b75c..cd29118e 100644
--- a/nls/th_TH.UTF-8/Makefile.am
+++ b/nls/th_TH.UTF-8/Makefile.am
@@ -10,7 +10,7 @@ XLC_LOCALE: XLC_LOCALE.pre
$(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $(srcdir)/XLC_LOCALE.pre > $@
Compose: Compose.pre
- $(CPP) -traditional -DXCOMM='#' - < Compose.pre > $@
+ $(CPP) -traditional -DXCOMM='#' - < $(srcdir)/Compose.pre > $@
Compose.pre:
touch Compose.pre
diff --git a/nls/th_TH/Makefile.am b/nls/th_TH/Makefile.am
index 89c2b75c..cd29118e 100644
--- a/nls/th_TH/Makefile.am
+++ b/nls/th_TH/Makefile.am
@@ -10,7 +10,7 @@ XLC_LOCALE: XLC_LOCALE.pre
$(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $(srcdir)/XLC_LOCALE.pre > $@
Compose: Compose.pre
- $(CPP) -traditional -DXCOMM='#' - < Compose.pre > $@
+ $(CPP) -traditional -DXCOMM='#' - < $(srcdir)/Compose.pre > $@
Compose.pre:
touch Compose.pre
diff --git a/nls/tscii-0/Makefile.am b/nls/tscii-0/Makefile.am
index 89c2b75c..cd29118e 100644
--- a/nls/tscii-0/Makefile.am
+++ b/nls/tscii-0/Makefile.am
@@ -10,7 +10,7 @@ XLC_LOCALE: XLC_LOCALE.pre
$(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $(srcdir)/XLC_LOCALE.pre > $@
Compose: Compose.pre
- $(CPP) -traditional -DXCOMM='#' - < Compose.pre > $@
+ $(CPP) -traditional -DXCOMM='#' - < $(srcdir)/Compose.pre > $@
Compose.pre:
touch Compose.pre
diff --git a/nls/zh_CN.UTF-8/Makefile.am b/nls/zh_CN.UTF-8/Makefile.am
index 89c2b75c..cd29118e 100644
--- a/nls/zh_CN.UTF-8/Makefile.am
+++ b/nls/zh_CN.UTF-8/Makefile.am
@@ -10,7 +10,7 @@ XLC_LOCALE: XLC_LOCALE.pre
$(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $(srcdir)/XLC_LOCALE.pre > $@
Compose: Compose.pre
- $(CPP) -traditional -DXCOMM='#' - < Compose.pre > $@
+ $(CPP) -traditional -DXCOMM='#' - < $(srcdir)/Compose.pre > $@
Compose.pre:
touch Compose.pre
diff --git a/nls/zh_CN/Makefile.am b/nls/zh_CN/Makefile.am
index 89c2b75c..cd29118e 100644
--- a/nls/zh_CN/Makefile.am
+++ b/nls/zh_CN/Makefile.am
@@ -10,7 +10,7 @@ XLC_LOCALE: XLC_LOCALE.pre
$(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $(srcdir)/XLC_LOCALE.pre > $@
Compose: Compose.pre
- $(CPP) -traditional -DXCOMM='#' - < Compose.pre > $@
+ $(CPP) -traditional -DXCOMM='#' - < $(srcdir)/Compose.pre > $@
Compose.pre:
touch Compose.pre
diff --git a/nls/zh_HK.UTF-8/Makefile.am b/nls/zh_HK.UTF-8/Makefile.am
index 89c2b75c..cd29118e 100644
--- a/nls/zh_HK.UTF-8/Makefile.am
+++ b/nls/zh_HK.UTF-8/Makefile.am
@@ -10,7 +10,7 @@ XLC_LOCALE: XLC_LOCALE.pre
$(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $(srcdir)/XLC_LOCALE.pre > $@
Compose: Compose.pre
- $(CPP) -traditional -DXCOMM='#' - < Compose.pre > $@
+ $(CPP) -traditional -DXCOMM='#' - < $(srcdir)/Compose.pre > $@
Compose.pre:
touch Compose.pre
diff --git a/nls/zh_TW.UTF-8/Makefile.am b/nls/zh_TW.UTF-8/Makefile.am
index 89c2b75c..cd29118e 100644
--- a/nls/zh_TW.UTF-8/Makefile.am
+++ b/nls/zh_TW.UTF-8/Makefile.am
@@ -10,7 +10,7 @@ XLC_LOCALE: XLC_LOCALE.pre
$(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $(srcdir)/XLC_LOCALE.pre > $@
Compose: Compose.pre
- $(CPP) -traditional -DXCOMM='#' - < Compose.pre > $@
+ $(CPP) -traditional -DXCOMM='#' - < $(srcdir)/Compose.pre > $@
Compose.pre:
touch Compose.pre
diff --git a/src/Makefile.am b/src/Makefile.am
index 7fe00bf1..1b7f1104 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -89,7 +89,6 @@ XCMS_SRCS= \
XI18N_SRCS=\
xim_trans.c \
- xim_trans.h \
ICWrap.c \
IMWrap.c \
XDefaultIMIF.c \
@@ -440,7 +439,6 @@ EXTRA_DIST = \
$(X11_SRCS) \
$(XI18N_SRCS) \
$(XCMS_SRCS) \
- X18NCMSstubs.c \
$(x11data_DATA)
libX11_la_SOURCES = $(X11_SRCS)
@@ -497,18 +495,17 @@ libX11_la_SOURCES += \
UnmapSubs.c \
UnmapWin.c \
WarpPtr.c \
- x11_trans.c \
- x11_trans.h
+ x11_trans.c
if DISABLE_XLOCALE
-libX11_la_SOURCES+= X18NCMSstubs.c
+libX11_la_SOURCES+= #X18NCMSstubs.c
else
libX11_la_SOURCES+= $(XI18N_SRCS)
endif
if DISABLE_XCMS
if !DISABLE_XLOCALE
-libX11_la_SOURCES+= X18NCMSstubs.c
+libX11_la_SOURCES+= #X18NCMSstubs.c
endif
else
libX11_la_SOURCES+= $(XCMS_SRCS)
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 08:33:01 +0000