diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-03-02 20:08:39 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-03-02 20:08:39 +0000 |
| commit | dfe5724765acc217ce43b4f96cc0d6dc2d73016c (patch) | |
| tree | f4f403cf19baee12aa491a678383cae27ccade37 /gtk/Makefile.am | |
| parent | f832e3484d146343e6f6bf4b36c4f19746f521f2 (diff) | |
| download | gtk+-dfe5724765acc217ce43b4f96cc0d6dc2d73016c.tar.gz | |
Default to --disable-gtk-doc (avoid Jade breakage) and --disable-static
Sat Mar 2 14:32:50 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Default to --disable-gtk-doc (avoid Jade
breakage) and --disable-static (static linking causes
problems with Xft changes.)
* autogen.sh: Add --enable-gtk-doc by default.
* Makefile.am: Add a 'mydistcheck' rule that passes
--enable-gtk-doc to the configure since that is needed
for 'make dist'.
* docs/tutorial/Makefile.am (dist-hook): Don't distribute
the PDF file. (Rule doesn't work on my system, plus it's
big.)
* gtk/Makefile.am: 'make dist' fixes.
Diffstat (limited to 'gtk/Makefile.am')
| -rw-r--r-- | gtk/Makefile.am | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 0115e06d0e..8c52c0f858 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -421,13 +421,11 @@ gtk_built_public_sources = @STRIP_BEGIN@ \ @STRIP_END@ # built sources that don't get installed gtk_built_sources = @STRIP_BEGIN@ \ - stamp-gtk.defs \ - stamp-gtktypebuiltins.h \ - stamp-gtkmarshalers.h \ gtktypebuiltins.c \ gtkmarshalers.c \ gtkmarshalers.h \ gtkmarshal.c \ + gtkmarshal.h \ gtk.defs \ ${gtk_built_public_sources} \ @STRIP_END@ @@ -466,7 +464,7 @@ $(libgtk_x11_1_3_la_OBJECTS) $(libgtk_linux_fb_1_3_la_OBJECTS) $(libgtk_win32_1_ # versions in the build dir. thus a development setup requires # srcdir to be writable, passing --disable-rebuilds to # ../configure will supress all autogeneration rules. -$(srcdir)/gtk.defs: @REBUILD@ gtk.defs gtk-boxed.defs $(gtk_public_h_sources) \ +$(srcdir)/gtk.defs: @REBUILD@ gtk-boxed.defs $(gtk_public_h_sources) Makefile case @GLIB_MKENUMS@ in \ .*) glib_mkenums=`pwd`/@GLIB_MKENUMS@ ;; \ *) glib_mkenums=@GLIB_MKENUMS@ ;; \ @@ -479,7 +477,7 @@ $(srcdir)/gtk.defs: @REBUILD@ gtk.defs gtk-boxed.defs $(gtk_public_h_sources) \ --vtail ")" \ $(gtk_public_h_sources) > xgen-gdef \ && cat gtk-boxed.defs >> xgen-gdef \ - && gtk.defs || cp xgen-gdef gtk.defs \ + && cp xgen-gdef gtk.defs \ && rm -f xgen-gdef all-local: @REBUILD@ gtk.defs @@ -611,7 +609,6 @@ files: done EXTRA_DIST += @STRIP_BEGIN@ \ - oldest-source-stamp \ line-arrow.xbm \ line-wrap.xbm \ tree_plus.xbm \ |