summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2000-07-14 20:08:10 +0000
committerOwen Taylor <otaylor@src.gnome.org>2000-07-14 20:08:10 +0000
commitbb268900245f3760ccd65c33d53602ab53fe2752 (patch)
treee3e8bf72c4dd9f5cded8fc79266be5950143eec5 /Makefile.am
parent9332748007543df54d5d2138aca2edd4742a3bd3 (diff)
downloadgdk-pixbuf-bb268900245f3760ccd65c33d53602ab53fe2752.tar.gz
Move gtk-config to gtk-config-2.0 move gtk_.m4 to gtk-2.0.m4
Fri Jul 14 12:22:49 2000 Owen Taylor <otaylor@redhat.com> * configure.in Makefile.am gtk-config.m4 gtk.m4: Move gtk-config to gtk-config-2.0 move gtk_.m4 to gtk-2.0.m4 * Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am gdk/Makefile.am demos/Makefile.am: Change library names to libgtk-1.3.la, etc, so that we can distinguish gtk-1.2 and gtk-2.0 on the linkline. * Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am gdk/Makefile.am gdk/x11/Makfile.am Move include files into /usr/include/gtk-2.0, /usr/lib/gtk-2.0/include/ * autogen.sh acconfig.h configure.in gtk/gtkmain.c gtk/gtkintl.h: Change package for gettext from gtk+ to gtk20. Put hack in autogen.sh to modify po/Makefile.in.in after gettextize to make this possible. * gtk+.spec: Some updates, not tested. * gdk-pixbuf/Makefile.am: Move loaders into $(libdir)/gtk-2.0/$(GTK_VERSION)/loaders. * gtk/Makefile.am gtk/gtkrc.c: Move RC file locations $(sysconfdir)/gtk-2.0 ~/.gtkrc-2.0; theme subdir to THEMENAME/gtk-2.0/. Move engine directory to $(libdir)/gtk-2.0/$(GTK_VERSION)/engines.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 24c865adc..d5ae251f4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
SRC_SUBDIRS = gdk-pixbuf gdk modules gtk demos
SUBDIRS = po $(SRC_SUBDIRS) docs
-bin_SCRIPTS = gtk-config
+bin_SCRIPTS = gtk-config-2.0
# require automake 1.4
AUTOMAKE_OPTIONS = 1.4
@@ -11,7 +11,7 @@ AUTOMAKE_OPTIONS = 1.4
EXTRA_DIST = \
HACKING \
gtk+.spec.in \
- gtk.m4 \
+ gtk-2.0.m4 \
makecopyright \
TODO \
TODO.xml \
@@ -122,7 +122,7 @@ dist-hook: gtk+.spec
&& cp gtk+.spec $(distdir)
m4datadir = $(datadir)/aclocal
-m4data_DATA = gtk.m4
+m4data_DATA = gtk-2.0.m4
.PHONY: files release sanity snapshot