forked from AuroraMiddleware/gtk
Reorganize pc files for a single library
After this commit, pc files no longer include the gdk backend in their name, and we no longer install a pc file for gdk. There is now a single gtk+-3.0.pc file. It turns out a separate gtk+-x11-3.0.pc file is not necessary, since gdkx.h doesn't have a separate include directory that would have to be added to Cflags.
This commit is contained in:
parent
07d49ee56a
commit
6465e8dd15
48
Makefile.am
48
Makefile.am
@ -54,40 +54,19 @@ MAINTAINERCLEANFILES = \
|
|||||||
$(srcdir)/ChangeLog \
|
$(srcdir)/ChangeLog \
|
||||||
`find "$(srcdir)" -type f -name Makefile.in -print`
|
`find "$(srcdir)" -type f -name Makefile.in -print`
|
||||||
|
|
||||||
GDKTARGET=@gdktarget@
|
|
||||||
|
|
||||||
## Copy .pc files to target-specific names
|
|
||||||
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)-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)-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)-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
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = gdk-$(GDKTARGET)-3.0.pc gtk+-$(GDKTARGET)-3.0.pc gail-3.0.pc
|
pkgconfig_DATA = gtk+-3.0.pc gail-3.0.pc
|
||||||
|
|
||||||
if OS_UNIX
|
if OS_UNIX
|
||||||
pkgconfig_DATA += gtk+-unix-print-3.0.pc
|
pkgconfig_DATA += gtk+-unix-print-3.0.pc
|
||||||
endif
|
endif
|
||||||
|
|
||||||
DISTCLEANFILES = \
|
DISTCLEANFILES = \
|
||||||
gtk+-unix-print-3.0.pc \
|
gtk+-unix-print-3.0.pc \
|
||||||
gtk+-$(GDKTARGET)-3.0.pc \
|
gtk+-3.0.pc \
|
||||||
gdk-$(GDKTARGET)-3.0.pc \
|
gail-3.0.pc \
|
||||||
gail-3.0.pc \
|
gtk+-3.0-uninstalled.pc \
|
||||||
gtk+-$(GDKTARGET)-3.0-uninstalled.pc \
|
gail-3.0-uninstalled.pc \
|
||||||
gdk-$(GDKTARGET)-3.0-uninstalled.pc \
|
|
||||||
gail-3.0-uninstalled.pc \
|
|
||||||
config.lt
|
config.lt
|
||||||
|
|
||||||
distclean-local:
|
distclean-local:
|
||||||
@ -109,20 +88,7 @@ ChangeLog:
|
|||||||
echo A git checkout and git-log is required to generate this file >> $@); \
|
echo A git checkout and git-log is required to generate this file >> $@); \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
## 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)-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-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:
|
uninstall-local:
|
||||||
rm -f $(DESTDIR)$(pkgconfigdir)/gdk-3.0.pc
|
|
||||||
rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-3.0.pc
|
rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-3.0.pc
|
||||||
|
|
||||||
dist-hook:
|
dist-hook:
|
||||||
|
@ -1560,11 +1560,9 @@ AC_CONFIG_FILES([
|
|||||||
config.h.win32
|
config.h.win32
|
||||||
gtk-zip.sh
|
gtk-zip.sh
|
||||||
Makefile
|
Makefile
|
||||||
gdk-3.0.pc
|
|
||||||
gtk+-3.0.pc
|
gtk+-3.0.pc
|
||||||
gtk+-unix-print-3.0.pc
|
gtk+-unix-print-3.0.pc
|
||||||
gail-3.0.pc
|
gail-3.0.pc
|
||||||
gdk-3.0-uninstalled.pc
|
|
||||||
gtk+-3.0-uninstalled.pc
|
gtk+-3.0-uninstalled.pc
|
||||||
gail-3.0-uninstalled.pc
|
gail-3.0-uninstalled.pc
|
||||||
m4macros/Makefile
|
m4macros/Makefile
|
||||||
|
@ -1,8 +0,0 @@
|
|||||||
target=@gdktarget@
|
|
||||||
|
|
||||||
Name: GDK Uninstalled
|
|
||||||
Description: GTK+ Drawing Kit (${target} target), Not Installed
|
|
||||||
Version: @VERSION@
|
|
||||||
Requires: gdk-pixbuf-@GTK_API_VERSION@-uninstalled @GDK_PACKAGES@
|
|
||||||
Libs: ${pc_top_builddir}/${pcfiledir}/gdk/libgdk-${target}-@GTK_API_VERSION@.la @GDK_EXTRA_LIBS@
|
|
||||||
Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@/gdk -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir} @GDK_EXTRA_CFLAGS@
|
|
@ -1,12 +0,0 @@
|
|||||||
prefix=@prefix@
|
|
||||||
exec_prefix=@exec_prefix@
|
|
||||||
libdir=@libdir@
|
|
||||||
includedir=@includedir@
|
|
||||||
target=@gdktarget@
|
|
||||||
|
|
||||||
Name: GDK
|
|
||||||
Description: GTK+ Drawing Kit (${target} target)
|
|
||||||
Version: @VERSION@
|
|
||||||
Requires: @GDK_PACKAGES@
|
|
||||||
Libs: -L${libdir} -lgdk-${target}-@GTK_API_VERSION@ @GDK_EXTRA_LIBS@
|
|
||||||
Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ -I${libdir}/gtk-@GTK_API_VERSION@/include @GDK_EXTRA_CFLAGS@ -DGSEAL_ENABLE
|
|
@ -8,8 +8,8 @@ gtk_binary_version=@GTK_BINARY_VERSION@
|
|||||||
gtk_host=@host@
|
gtk_host=@host@
|
||||||
|
|
||||||
Name: GTK+
|
Name: GTK+
|
||||||
Description: GTK+ Graphical UI Library (${target} target)
|
Description: GTK+ Graphical UI Library
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
Requires: gdk-${target}-@GTK_API_VERSION@ @GTK_PACKAGES@
|
Requires: @GTK_PACKAGES@
|
||||||
Libs: -L${libdir} -lgtk-${target}-@GTK_API_VERSION@ @GTK_EXTRA_LIBS@
|
Libs: -L${libdir} -lgtk-@GTK_API_VERSION@ @GTK_EXTRA_LIBS@
|
||||||
Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GTK_EXTRA_CFLAGS@ -DGSEAL_ENABLE
|
Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GTK_EXTRA_CFLAGS@ -DGSEAL_ENABLE
|
||||||
|
@ -10,5 +10,5 @@ gtk_host=@host@
|
|||||||
Name: GTK+
|
Name: GTK+
|
||||||
Description: GTK+ Unix print support
|
Description: GTK+ Unix print support
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
Requires: gtk+-${target}-@GTK_API_VERSION@ @GTK_PACKAGES@
|
Requires: gtk+-@GTK_API_VERSION@ @GTK_PACKAGES@
|
||||||
Cflags: -I${includedir}/gtk-@GTK_API_VERSION@/unix-print
|
Cflags: -I${includedir}/gtk-@GTK_API_VERSION@/unix-print
|
||||||
|
Loading…
Reference in New Issue
Block a user