| blob | e7b4474618bdcd84b5b27f799d802863ad14343c |
1 --- docs/Makefile.am
2 +++ docs/Makefile.am
3 @@ -166,7 +166,7 @@
4 echo $$p; \
5 done
7 -EXTRA_DIST += \
8 +EXTRA_DIST = \
9 Changes-1.2.txt \
10 debugging.txt \
11 developers.txt \
12 --- gdk/Makefile.am
13 +++ gdk/Makefile.am
14 @@ -30,7 +30,7 @@
15 # setup source file variables
16 #
17 # GDK header files for public installation (non-generated)
18 -gdk_public_h_sources = @STRIP_BEGIN@ \
19 +gdk_public_h_sources = \
20 gdk.h \
21 gdkcursors.h \
22 gdkrgb.h \
23 @@ -38,9 +38,8 @@
24 gdkkeysyms.h \
25 gdkprivate.h \
26 gdktypes.h \
27 - gdkx.h \
28 -@STRIP_END@
29 -gdk_c_sources = @STRIP_BEGIN@ \
30 + gdkx.h
31 +gdk_c_sources = \
32 gdk.c \
33 gdkcc.c \
34 gdkcolor.c \
35 @@ -71,8 +70,7 @@
36 MwmUtil.h \
37 gxid_lib.h \
38 gxid_proto.h \
39 - gxid_lib.c \
40 -@STRIP_END@
41 + gxid_lib.c
43 #
44 # setup GDK sources and their dependancies
45 @@ -79,10 +79,6 @@
46 #
47 libgdkinclude_HEADERS = $(gdk_public_h_sources)
48 libgdk_la_SOURCES = $(gdk_c_sources)
49 -MAINTAINERCLEANFILES +=
50 -EXTRA_HEADERS +=
51 -EXTRA_DIST +=
52 -EXTRA_DIST +=
54 #
55 # rules to generate built sources
56 --- gtk/Makefile.am
57 +++ gtk/Makefile.am
58 @@ -41,7 +41,7 @@
59 # setup source file variables
60 #
61 # GTK+ header files for public installation (non-generated)
62 -gtk_public_h_sources = @STRIP_BEGIN@ \
63 +gtk_public_h_sources = \
64 gtk.h \
65 gtkaccelgroup.h \
66 gtkaccellabel.h \
67 @@ -150,13 +150,12 @@
68 gtkvscrollbar.h \
69 gtkvseparator.h \
70 gtkwidget.h \
71 - gtkwindow.h \
72 -@STRIP_END@
73 + gtkwindow.h
74 # GTK+ header files that don't get installed
75 gtk_private_h_sources = @STRIP_BEGIN@ \
76 @STRIP_END@
77 # GTK+ C sources to build the library from
78 -gtk_c_sources = @STRIP_BEGIN@ \
79 +gtk_c_sources = \
80 gtkaccelgroup.c \
81 gtkaccellabel.c \
82 gtkadjustment.c \
83 @@ -264,8 +263,7 @@
84 gtkwidget.c \
85 gtkwindow.c \
86 fnmatch.c \
87 - fnmatch.h \
88 -@STRIP_END@
89 + fnmatch.h
90 # we use our own built_sources variable rules to avoid automake's
91 # BUILT_SOURCES oddities
92 # we generate frequently rebuild files piggyback on a stamp file, so sources
93 @@ -284,10 +282,9 @@
94 gtk.defs \
95 @STRIP_END@
96 # built sources that get installed with the header files
97 -gtk_built_public_sources = @STRIP_BEGIN@ \
98 +gtk_built_public_sources = \
99 gtkmarshal.h \
100 - gtktypebuiltins.h \
101 -@STRIP_END@
102 + gtktypebuiltins.h
103 # non-header sources (headers should be specified in the above variables)
104 # that don't serve as direct make target sources, i.e. they don't have
105 # their own .lo rules and don't get publically installed
106 @@ -313,9 +313,8 @@
107 #
108 libgtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkfeatures.h
109 libgtk_la_SOURCES = $(gtk_c_sources)
110 -MAINTAINERCLEANFILES += $(gtk_built_public_sources) $(gtk_built_sources)
111 -EXTRA_HEADERS +=
112 -EXTRA_DIST += $(gtk_private_h_sources)
113 +MAINTAINERCLEANFILES = $(gtk_built_public_sources) $(gtk_built_sources)
114 +EXTRA_DIST = $(gtk_private_h_sources)
115 EXTRA_DIST += $(gtk_built_sources) $(gtk_built_public_sources) $(gtk_extra_sources)
117 #
118 @@ -323,7 +322,7 @@
119 #
120 # setup autogeneration dependancies
121 gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc
122 -CLEANFILES += $(gen_sources)
123 +CLEANFILES = $(gen_sources)
124 COPYING: $(gtk_built_public_sources) $(gtk_built_sources)
125 $(OBJECTS): COPYING # this is our oldest-source-stamp
126 # initial creation of the real stamp-* files