1999-10-09 18:46:10 +00:00
|
|
|
--- Makefile.in.orig Fri Sep 24 09:12:11 1999
|
|
|
|
+++ Makefile.in Sat Oct 9 22:05:42 1999
|
|
|
|
@@ -129,7 +129,7 @@
|
1998-08-12 10:38:28 +00:00
|
|
|
SRC_SUBDIRS = gdk gtk
|
1999-01-20 22:14:29 +00:00
|
|
|
SUBDIRS = po $(SRC_SUBDIRS) docs
|
1998-04-23 20:54:21 +00:00
|
|
|
|
1998-08-12 10:38:28 +00:00
|
|
|
-bin_SCRIPTS = gtk-config
|
1999-05-29 03:49:46 +00:00
|
|
|
+bin_SCRIPTS = gtk@LT_RELEASE@-config
|
1998-04-23 20:54:21 +00:00
|
|
|
|
1999-10-09 18:46:10 +00:00
|
|
|
# require automake 1.4
|
|
|
|
AUTOMAKE_OPTIONS = 1.4
|
|
|
|
@@ -142,7 +142,7 @@
|
1998-08-12 10:38:28 +00:00
|
|
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
|
|
CONFIG_HEADER = config.h
|
1999-03-09 01:13:40 +00:00
|
|
|
-CONFIG_CLEAN_FILES = gtk+.spec gtk-config
|
1999-05-29 03:49:46 +00:00
|
|
|
+CONFIG_CLEAN_FILES = gtk+.spec gtk@LT_RELEASE@-config
|
1998-08-12 10:38:28 +00:00
|
|
|
SCRIPTS = $(bin_SCRIPTS)
|
|
|
|
|
|
|
|
DATA = $(m4data_DATA)
|
1999-10-09 18:46:10 +00:00
|
|
|
@@ -204,7 +204,10 @@
|
1998-08-12 10:38:28 +00:00
|
|
|
maintainer-clean-hdr:
|
1999-03-09 01:13:40 +00:00
|
|
|
gtk+.spec: $(top_builddir)/config.status gtk+.spec.in
|
|
|
|
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
1998-08-12 10:38:28 +00:00
|
|
|
-gtk-config: $(top_builddir)/config.status gtk-config.in
|
1999-05-29 03:49:46 +00:00
|
|
|
+gtk@LT_RELEASE@-config.in: gtk-config.in
|
|
|
|
+ cp gtk-config.in gtk@LT_RELEASE@-config.in
|
1998-08-12 10:38:28 +00:00
|
|
|
+
|
1999-05-29 03:49:46 +00:00
|
|
|
+gtk@LT_RELEASE@-config: $(top_builddir)/config.status gtk@LT_RELEASE@-config.in
|
1999-01-31 16:55:07 +00:00
|
|
|
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
1998-08-12 10:38:28 +00:00
|
|
|
|
|
|
|
install-binSCRIPTS: $(bin_SCRIPTS)
|
1999-10-09 18:46:10 +00:00
|
|
|
@@ -413,7 +416,6 @@
|
1999-03-09 01:13:40 +00:00
|
|
|
|| exit 1; \
|
|
|
|
fi; \
|
|
|
|
done
|
|
|
|
- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
|
|
|
|
info-am:
|
|
|
|
info: info-recursive
|
|
|
|
dvi-am:
|
1999-10-13 11:19:19 +00:00
|
|
|
--- gtk/Makefile.in.orig Fri Oct 8 10:57:08 1999
|
|
|
|
+++ gtk/Makefile.in Tue Oct 12 16:04:29 1999
|
1999-10-09 18:46:10 +00:00
|
|
|
@@ -126,7 +126,7 @@
|
|
|
|
x_libs = @x_libs@
|
|
|
|
xinput_progs = @xinput_progs@
|
|
|
|
|
|
|
|
-INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_EXE_PREFIX=\"$(exec_prefix)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -I$(top_srcdir) @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @GLIB_CFLAGS@ @x_cflags@ @STRIP_END@
|
|
|
|
+INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_EXE_PREFIX=\"$(exec_prefix)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(gtkconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -I$(top_srcdir) @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @GLIB_CFLAGS@ @x_cflags@ @STRIP_END@
|
|
|
|
|
1999-01-31 16:55:07 +00:00
|
|
|
|
1999-10-09 18:46:10 +00:00
|
|
|
#
|
|
|
|
@@ -191,7 +191,7 @@
|
|
|
|
gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc
|
|
|
|
CLEANFILES = $(gen_sources)
|
1999-01-31 16:55:07 +00:00
|
|
|
|
1999-03-09 01:13:40 +00:00
|
|
|
-gtkconfdir = $(sysconfdir)/gtk
|
|
|
|
+gtkconfdir = $(datadir)/themes/Default/gtk
|
1999-10-13 11:19:19 +00:00
|
|
|
gtkconf_DATA = gtkrc.bg gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.Big5 gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii
|
1999-01-31 16:55:07 +00:00
|
|
|
|
1999-10-13 11:19:19 +00:00
|
|
|
|
|
|
|
@@ -504,7 +504,7 @@
|
1999-03-09 01:13:40 +00:00
|
|
|
uninstall-am: uninstall-libLTLIBRARIES uninstall-gtkconfDATA \
|
1999-10-09 18:46:10 +00:00
|
|
|
uninstall-libgtkincludeHEADERS uninstall-local
|
1999-01-31 16:55:07 +00:00
|
|
|
uninstall: uninstall-am
|
1999-03-09 01:13:40 +00:00
|
|
|
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
|
|
|
|
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
|
1999-01-31 16:55:07 +00:00
|
|
|
all-redirect: all-am
|
|
|
|
install-strip:
|
|
|
|
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
|
1999-10-09 18:46:10 +00:00
|
|
|
--- docs/Makefile.in.orig Fri Sep 24 09:13:34 1999
|
|
|
|
+++ docs/Makefile.in Sat Oct 9 22:15:26 1999
|
1999-02-01 20:44:23 +00:00
|
|
|
@@ -99,7 +99,7 @@
|
|
|
|
LT_RELEASE = @LT_RELEASE@
|
|
|
|
LT_REVISION = @LT_REVISION@
|
|
|
|
MAINT = @MAINT@
|
|
|
|
-MAKEINFO = @MAKEINFO@
|
|
|
|
+MAKEINFO = @MAKEINFO@ --no-split
|
|
|
|
MKINSTALLDIRS = @MKINSTALLDIRS@
|
|
|
|
NM = @NM@
|
1999-05-29 03:49:46 +00:00
|
|
|
OBJDUMP = @OBJDUMP@
|
1999-10-09 18:46:10 +00:00
|
|
|
@@ -128,7 +128,7 @@
|
1999-03-09 01:13:40 +00:00
|
|
|
|
|
|
|
info_TEXINFOS = gdk.texi gtk.texi
|
|
|
|
|
|
|
|
-man_MANS = gtk-config.1
|
1999-05-29 03:49:46 +00:00
|
|
|
+man_MANS = gtk@LT_RELEASE@-config.1
|
1999-03-09 01:13:40 +00:00
|
|
|
|
|
|
|
TUTORIAL_FR_FILES = html/gtk_tut_fr-1.html html/gtk_tut_fr-2.html html/gtk_tut_fr-3.html html/gtk_tut_fr-4.html html/gtk_tut_fr-5.html html/gtk_tut_fr-6.html html/gtk_tut_fr-7.html html/gtk_tut_fr-8.html html/gtk_tut_fr-9.html html/gtk_tut_fr-10.html html/gtk_tut_fr-11.html html/gtk_tut_fr-12.html html/gtk_tut_fr-13.html html/gtk_tut_fr-14.html html/gtk_tut_fr-15.html html/gtk_tut_fr-16.html html/gtk_tut_fr-17.html html/gtk_tut_fr-18.html html/gtk_tut_fr-19.html html/gtk_tut_fr-20.html html/gtk_tut_fr-21.html html/gtk_tut_fr-22.html html/gtk_tut_fr-23.html html/gtk_tut_fr-24.html html/gtk_tut_fr.html text/gtk_tut_fr.txt
|
|
|
|
|
1999-10-09 18:46:10 +00:00
|
|
|
@@ -146,7 +146,7 @@
|
1999-03-09 01:13:40 +00:00
|
|
|
|
|
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
|
|
CONFIG_HEADER = ../config.h
|
1999-10-09 18:46:10 +00:00
|
|
|
-CONFIG_CLEAN_FILES = gtk-config.1
|
|
|
|
+CONFIG_CLEAN_FILES = gtk@LT_RELEASE@-config.1
|
|
|
|
TEXI2DVI = texi2dvi
|
|
|
|
INFO_DEPS = gdk.info gtk.info
|
|
|
|
DVIS = gdk.dvi gtk.dvi
|
|
|
|
@@ -174,6 +174,9 @@
|
|
|
|
|
|
|
|
gtk-config.1: $(top_builddir)/config.status gtk-config.1.in
|
|
|
|
cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
|
|
|
+
|
1999-05-29 03:49:46 +00:00
|
|
|
+gtk@LT_RELEASE@-config.1: gtk-config.1
|
|
|
|
+ cp gtk-config.1 gtk@LT_RELEASE@-config.1
|
1999-03-09 01:13:40 +00:00
|
|
|
|
1999-10-09 18:46:10 +00:00
|
|
|
gdk.info: gdk.texi
|
|
|
|
gdk.dvi: gdk.texi
|