blob: ba85f17c027407cd29cdca8c45d2b172800bcda8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
|
Index: gtk+-2.18.5/docs/faq/Makefile.am
===================================================================
--- gtk+-2.18.5.orig/docs/faq/Makefile.am 2009-12-10 17:38:18.000000000 +0000
+++ gtk+-2.18.5/docs/faq/Makefile.am 2009-12-10 17:39:27.000000000 +0000
@@ -3,34 +3,36 @@
EXTRA_DIST += \
gtk-faq.sgml
-if HAVE_DOCBOOK
+
html:
+if HAVE_DOCBOOK
if test -w $(srcdir); then \
(cd $(srcdir); \
db2html gtk-faq.sgml; \
test -d html && rm -r html; \
mv gtk-faq html); \
fi
-
-pdf:
- if test -w $(srcdir); then \
- (cd $(srcdir); db2pdf gtk-faq.sgml); \
- fi
-
-dist-hook: html
- cp -Rp $(srcdir)/html $(distdir)
else
-html:
echo "***"
echo "*** Warning: FAQ not built"
echo "***"
+endif
pdf:
+if HAVE_DOCBOOK
+ if test -w $(srcdir); then \
+ (cd $(srcdir); db2pdf gtk-faq.sgml); \
+ fi
+else
echo "***"
echo "*** Warning: FAQ not built"
echo "***"
+endif
-dist-hook:
+dist-hook: html
+if HAVE_DOCBOOK
+ cp -Rp $(srcdir)/html $(distdir)
+else
echo "***"
echo "*** Warning: FAQ not built"
echo "*** DISTRIBUTION IS INCOMPLETE"
Index: gtk+-2.18.5/gtk-doc.make
===================================================================
--- gtk+-2.18.5.orig/gtk-doc.make 2009-12-10 17:47:54.000000000 +0000
+++ gtk+-2.18.5/gtk-doc.make 2009-12-10 17:48:01.000000000 +0000
@@ -23,7 +23,7 @@
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-EXTRA_DIST = \
+EXTRA_DIST += \
$(content_files) \
$(HTML_IMAGES) \
$(DOC_MAIN_SGML_FILE) \
Index: gtk+-2.18.5/gtk/tests/Makefile.am
===================================================================
--- gtk+-2.18.5.orig/gtk/tests/Makefile.am 2009-12-10 17:43:16.000000000 +0000
+++ gtk+-2.18.5/gtk/tests/Makefile.am 2009-12-10 18:11:40.000000000 +0000
@@ -57,13 +57,13 @@
# this doesn't work in make distcheck, since running
# on a naked X server creates slightly different event
# sequences than running on a normal desktop
-# TEST_PROGS += crossingevents
+#TEST_PROGS += crossingevents
crossingevents_SOURCES = crossingevents.c
crossingevents_LDADD = $(progs_ldadd)
# this doesn't work in make distcheck, since it doesn't
# find file-chooser-test-dir
-# TEST_PROGS += filechooser
+#TEST_PROGS += filechooser
filechooser_SOURCES = filechooser.c pixbuf-init.c
filechooser_LDADD = $(progs_ldadd)
Index: gtk+-2.18.5/tests/Makefile.am
===================================================================
--- gtk+-2.18.5.orig/tests/Makefile.am 2009-12-10 17:41:49.000000000 +0000
+++ gtk+-2.18.5/tests/Makefile.am 2009-12-10 17:45:33.000000000 +0000
@@ -339,7 +339,7 @@
gtkoffscreenbox.h \
testoffscreen.c
-testwindow_SOURCES = \
+testwindows_SOURCES = \
testwindows.c
EXTRA_DIST += \
|