126 lines
3.2 KiB
Diff
126 lines
3.2 KiB
Diff
--- docs/Makefile.am
|
|
+++ docs/Makefile.am
|
|
@@ -166,7 +166,7 @@
|
|
echo $$p; \
|
|
done
|
|
|
|
-EXTRA_DIST += \
|
|
+EXTRA_DIST = \
|
|
Changes-1.2.txt \
|
|
debugging.txt \
|
|
developers.txt \
|
|
--- gdk/Makefile.am
|
|
+++ gdk/Makefile.am
|
|
@@ -30,7 +30,7 @@
|
|
# setup source file variables
|
|
#
|
|
# GDK header files for public installation (non-generated)
|
|
-gdk_public_h_sources = @STRIP_BEGIN@ \
|
|
+gdk_public_h_sources = \
|
|
gdk.h \
|
|
gdkcursors.h \
|
|
gdkrgb.h \
|
|
@@ -38,9 +38,8 @@
|
|
gdkkeysyms.h \
|
|
gdkprivate.h \
|
|
gdktypes.h \
|
|
- gdkx.h \
|
|
-@STRIP_END@
|
|
-gdk_c_sources = @STRIP_BEGIN@ \
|
|
+ gdkx.h
|
|
+gdk_c_sources = \
|
|
gdk.c \
|
|
gdkcc.c \
|
|
gdkcolor.c \
|
|
@@ -71,8 +70,7 @@
|
|
MwmUtil.h \
|
|
gxid_lib.h \
|
|
gxid_proto.h \
|
|
- gxid_lib.c \
|
|
-@STRIP_END@
|
|
+ gxid_lib.c
|
|
|
|
#
|
|
# setup GDK sources and their dependancies
|
|
@@ -79,10 +79,6 @@
|
|
#
|
|
libgdkinclude_HEADERS = $(gdk_public_h_sources)
|
|
libgdk_la_SOURCES = $(gdk_c_sources)
|
|
-MAINTAINERCLEANFILES +=
|
|
-EXTRA_HEADERS +=
|
|
-EXTRA_DIST +=
|
|
-EXTRA_DIST +=
|
|
|
|
#
|
|
# rules to generate built sources
|
|
--- gtk/Makefile.am
|
|
+++ gtk/Makefile.am
|
|
@@ -41,7 +41,7 @@
|
|
# setup source file variables
|
|
#
|
|
# GTK+ header files for public installation (non-generated)
|
|
-gtk_public_h_sources = @STRIP_BEGIN@ \
|
|
+gtk_public_h_sources = \
|
|
gtk.h \
|
|
gtkaccelgroup.h \
|
|
gtkaccellabel.h \
|
|
@@ -150,13 +150,12 @@
|
|
gtkvscrollbar.h \
|
|
gtkvseparator.h \
|
|
gtkwidget.h \
|
|
- gtkwindow.h \
|
|
-@STRIP_END@
|
|
+ gtkwindow.h
|
|
# GTK+ header files that don't get installed
|
|
gtk_private_h_sources = @STRIP_BEGIN@ \
|
|
@STRIP_END@
|
|
# GTK+ C sources to build the library from
|
|
-gtk_c_sources = @STRIP_BEGIN@ \
|
|
+gtk_c_sources = \
|
|
gtkaccelgroup.c \
|
|
gtkaccellabel.c \
|
|
gtkadjustment.c \
|
|
@@ -264,8 +263,7 @@
|
|
gtkwidget.c \
|
|
gtkwindow.c \
|
|
fnmatch.c \
|
|
- fnmatch.h \
|
|
-@STRIP_END@
|
|
+ fnmatch.h
|
|
# we use our own built_sources variable rules to avoid automake's
|
|
# BUILT_SOURCES oddities
|
|
# we generate frequently rebuild files piggyback on a stamp file, so sources
|
|
@@ -284,10 +282,9 @@
|
|
gtk.defs \
|
|
@STRIP_END@
|
|
# built sources that get installed with the header files
|
|
-gtk_built_public_sources = @STRIP_BEGIN@ \
|
|
+gtk_built_public_sources = \
|
|
gtkmarshal.h \
|
|
- gtktypebuiltins.h \
|
|
-@STRIP_END@
|
|
+ gtktypebuiltins.h
|
|
# non-header sources (headers should be specified in the above variables)
|
|
# that don't serve as direct make target sources, i.e. they don't have
|
|
# their own .lo rules and don't get publically installed
|
|
@@ -313,9 +313,8 @@
|
|
#
|
|
libgtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkfeatures.h
|
|
libgtk_la_SOURCES = $(gtk_c_sources)
|
|
-MAINTAINERCLEANFILES += $(gtk_built_public_sources) $(gtk_built_sources)
|
|
-EXTRA_HEADERS +=
|
|
-EXTRA_DIST += $(gtk_private_h_sources)
|
|
+MAINTAINERCLEANFILES = $(gtk_built_public_sources) $(gtk_built_sources)
|
|
+EXTRA_DIST = $(gtk_private_h_sources)
|
|
EXTRA_DIST += $(gtk_built_sources) $(gtk_built_public_sources) $(gtk_extra_sources)
|
|
|
|
#
|
|
@@ -323,7 +322,7 @@
|
|
#
|
|
# setup autogeneration dependancies
|
|
gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc
|
|
-CLEANFILES += $(gen_sources)
|
|
+CLEANFILES = $(gen_sources)
|
|
COPYING: $(gtk_built_public_sources) $(gtk_built_sources)
|
|
$(OBJECTS): COPYING # this is our oldest-source-stamp
|
|
# initial creation of the real stamp-* files
|