diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-05-08 01:18:53 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-05-08 01:18:53 -0400 |
| commit | 7447ef0fc24dc046b92b55e75c02ff0725b85680 (patch) | |
| tree | 6af1b816ce3a09cca904877249f17d2d96eac614 /Makefile.am | |
| parent | 51ddf0e1c9280faf020a916974f2535ed3f5f14f (diff) | |
| download | gtk+-7447ef0fc24dc046b92b55e75c02ff0725b85680.tar.gz | |
Make 3.0 parallel-installable to 2.x
In particular, rename
- libraries to lib*-3.0.so
- pc files to *-3.0.pc
- include paths to /usr/include/gtk-3.0/*
- module paths to /usr/lib/gtk-3.0/*
- rc files names to gtk-3.0/gtkrc
- commandline utilities to *-3.0
- adjust documentation
Also change the install location for unix-print headers to
/usr/include/gtk-3.0/unix-print/gtk.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 57 |
1 files changed, 28 insertions, 29 deletions
diff --git a/Makefile.am b/Makefile.am index 669c8d6591..48620908a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,6 @@ include $(top_srcdir)/Makefile.decl SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build -# require automake 1.4 AUTOMAKE_OPTIONS = 1.7 ACLOCAL_AMFLAGS = -I m4 @@ -132,36 +131,36 @@ MAINTAINERCLEANFILES = \ GDKTARGET=@gdktarget@ ## Copy .pc files to target-specific names -gtk+-$(GDKTARGET)-2.0.pc: gtk+-2.0.pc - rm -f gtk+-$(GDKTARGET)-2.0.pc && \ - cp gtk+-2.0.pc gtk+-$(GDKTARGET)-2.0.pc +gtk+-$(GDKTARGET)-3.0.pc: gtk+-3.0.pc + rm -f gtk+-$(GDKTARGET)-3.0.pc && \ + cp gtk+-3.0.pc gtk+-$(GDKTARGET)-3.0.pc -gdk-$(GDKTARGET)-2.0.pc: gdk-2.0.pc - rm -f gdk-$(GDKTARGET)-2.0.pc && \ - cp gdk-2.0.pc gdk-$(GDKTARGET)-2.0.pc +gdk-$(GDKTARGET)-3.0.pc: gdk-3.0.pc + rm -f gdk-$(GDKTARGET)-3.0.pc && \ + cp gdk-3.0.pc gdk-$(GDKTARGET)-3.0.pc -gtk+-$(GDKTARGET)-2.0-uninstalled.pc: gtk+-2.0-uninstalled.pc - rm -f gtk+-$(GDKTARGET)-2.0-uninstalled.pc && \ - cp gtk+-2.0-uninstalled.pc gtk+-$(GDKTARGET)-2.0-uninstalled.pc +gtk+-$(GDKTARGET)-3.0-uninstalled.pc: gtk+-3.0-uninstalled.pc + rm -f gtk+-$(GDKTARGET)-3.0-uninstalled.pc && \ + cp gtk+-3.0-uninstalled.pc gtk+-$(GDKTARGET)-3.0-uninstalled.pc -gdk-$(GDKTARGET)-2.0-uninstalled.pc: gdk-2.0-uninstalled.pc - rm -f gdk-$(GDKTARGET)-2.0-uninstalled.pc && \ - cp gdk-2.0-uninstalled.pc gdk-$(GDKTARGET)-2.0-uninstalled.pc +gdk-$(GDKTARGET)-3.0-uninstalled.pc: gdk-3.0-uninstalled.pc + rm -f gdk-$(GDKTARGET)-3.0-uninstalled.pc && \ + cp gdk-3.0-uninstalled.pc gdk-$(GDKTARGET)-3.0-uninstalled.pc pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc gail.pc +pkgconfig_DATA= gdk-pixbuf-3.0.pc gdk-$(GDKTARGET)-3.0.pc gtk+-$(GDKTARGET)-3.0.pc gail.pc if OS_UNIX -pkgconfig_DATA += gtk+-unix-print-2.0.pc +pkgconfig_DATA += gtk+-unix-print-3.0.pc endif DISTCLEANFILES = \ - gtk+-unix-print-2.0.pc \ - gtk+-$(GDKTARGET)-2.0.pc \ - gdk-$(GDKTARGET)-2.0.pc \ + gtk+-unix-print-3.0.pc \ + gtk+-$(GDKTARGET)-3.0.pc \ + gdk-$(GDKTARGET)-3.0.pc \ gail.pc \ - gtk+-$(GDKTARGET)-2.0-uninstalled.pc \ - gdk-$(GDKTARGET)-2.0-uninstalled.pc \ + gtk+-$(GDKTARGET)-3.0-uninstalled.pc \ + gdk-$(GDKTARGET)-3.0-uninstalled.pc \ gail-uninstalled.pc \ config.lt @@ -184,21 +183,21 @@ ChangeLog: echo A git checkout and git-log is required to generate this file >> $@); \ fi -## copy the default target for this platform to gdk-2.0.pc and gtk+-2.0.pc +## copy the default target for this platform to gdk-3.0.pc and gtk+-3.0.pc DEFAULT_GDKTARGET=x11 install-data-hook: (cd $(DESTDIR)$(pkgconfigdir) && \ - test -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc && \ - test -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc && \ - rm -f gdk-2.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc gdk-2.0.pc && \ - rm -f gtk+-2.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc gtk+-2.0.pc) || \ + test -f gdk-$(DEFAULT_GDKTARGET)-3.0.pc && \ + test -f gtk+-$(DEFAULT_GDKTARGET)-3.0.pc && \ + rm -f gdk-3.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-3.0.pc gdk-3.0.pc && \ + rm -f gtk+-3.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-3.0.pc gtk+-3.0.pc) || \ (cd $(DESTDIR)$(pkgconfigdir) && \ - rm -f gdk-2.0.pc && cp -f gdk-$(GDKTARGET)-2.0.pc gdk-2.0.pc && \ - rm -f gtk+-2.0.pc && cp -f gtk+-$(GDKTARGET)-2.0.pc gtk+-2.0.pc) + rm -f gdk-3.0.pc && cp -f gdk-$(GDKTARGET)-3.0.pc gdk-3.0.pc && \ + rm -f gtk+-3.0.pc && cp -f gtk+-$(GDKTARGET)-3.0.pc gtk+-3.0.pc) uninstall-local: - rm -f $(DESTDIR)$(pkgconfigdir)/gdk-2.0.pc - rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-2.0.pc + rm -f $(DESTDIR)$(pkgconfigdir)/gdk-3.0.pc + rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-3.0.pc dist-hook: if test -f $(srcdir)/INSTALL.in && test -f $(srcdir)/README.in ; then \ |