diff options
author | Matthias Clasen <mclasen@redhat.com> | 2010-12-14 23:49:42 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2010-12-21 12:06:59 -0500 |
commit | 968668629b82679484a650f2a4e494bf91ec8cdc (patch) | |
tree | 5adfc1c1431b648c555a5780adb2644b8cff8bcc | |
parent | 5eb4506b944879c37ea3521cb082a383ab26039a (diff) | |
download | gtk+-968668629b82679484a650f2a4e494bf91ec8cdc.tar.gz |
Go back to installing libgdk.so
-rw-r--r-- | Makefile.am | 6 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | docs/reference/gtk/compiling.sgml | 2 | ||||
-rw-r--r-- | gdk-3.0.pc.in | 12 | ||||
-rw-r--r-- | gdk/Makefile.am | 7 | ||||
-rw-r--r-- | gtk+-3.0.pc.in | 2 |
6 files changed, 21 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index c95b0e685a..faf57f10c6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,12 +60,16 @@ gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc: gtk+-3.0.pc rm -f $@ && \ cp gtk+-3.0.pc $@ +gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc: gdk-3.0.pc + rm -f $@ && \ + cp gdk-3.0.pc $@ + gtk+-*-3.0-uninstalled.pc: gtk+-3.0-uninstalled.pc rm -f $@ && \ cp gtk+-3.0-uninstalled.pc $@ pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = gtk+-3.0.pc gail-3.0.pc +pkgconfig_DATA = gdk-3.0.pc gtk+-3.0.pc gail-3.0.pc pkgconfig_DATA += $(patsubst %,gtk+-%-3.0.pc,@gdktarget@) diff --git a/configure.ac b/configure.ac index 9ff5b67050..b466bdab2a 100644 --- a/configure.ac +++ b/configure.ac @@ -1560,6 +1560,7 @@ AC_CONFIG_FILES([ config.h.win32 gtk-zip.sh Makefile +gdk-3.0.pc gtk+-3.0.pc gtk+-unix-print-3.0.pc gail-3.0.pc diff --git a/docs/reference/gtk/compiling.sgml b/docs/reference/gtk/compiling.sgml index f40267fb1b..1914b0ee2d 100644 --- a/docs/reference/gtk/compiling.sgml +++ b/docs/reference/gtk/compiling.sgml @@ -32,7 +32,7 @@ your system may be different): $ pkg-config --cflags gtk+-3.0 -pthread -I/usr/include/gtk-3.0 -I/usr/lib64/gtk-3.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 $ pkg-config --libs gtk+-3.0 - -pthread -lgtk-x11-3.0 -lgdk-x11-3.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-3.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 + -pthread -lgtk-3.0 -lgdk-3.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-3.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 </programlisting> </para> <para> diff --git a/gdk-3.0.pc.in b/gdk-3.0.pc.in new file mode 100644 index 0000000000..796938d937 --- /dev/null +++ b/gdk-3.0.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +target=@gdktarget@ + +Name: GDK +Description: GTK+ Drawing Kit +Version: @VERSION@ +Requires: @GDK_PACKAGES@ +Libs: -L${libdir} -lgdk-@GTK_API_VERSION@ @GDK_EXTRA_LIBS@ +Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GDK_EXTRA_CFLAGS@ diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 3413076249..2545e29ff4 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -159,10 +159,6 @@ libgdk_3_0_la_SOURCES = $(common_sources) libgdk_3_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) libgdk_3_0_la_LDFLAGS = $(LDADD) -libgdk_x11_3_0_la_SOURCES = $(common_sources) -libgdk_x11_3_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) -libgdk_x11_3_0_la_LDFLAGS = $(LDADD) - libgdk_quartz_3_0_la_SOURCES = $(common_sources) gdkkeynames.c libgdk_quartz_3_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS) libgdk_quartz_3_0_la_LDFLAGS = $(LDADD) @@ -284,8 +280,7 @@ if OS_LINUX TESTS = abicheck.sh endif - -noinst_LTLIBRARIES = libgdk-3.0.la +lib_LTLIBRARIES = libgdk-3.0.la MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h EXTRA_DIST += $(gdk_built_sources) diff --git a/gtk+-3.0.pc.in b/gtk+-3.0.pc.in index c686112428..b11c4a1791 100644 --- a/gtk+-3.0.pc.in +++ b/gtk+-3.0.pc.in @@ -10,6 +10,6 @@ gtk_host=@host@ Name: GTK+ Description: GTK+ Graphical UI Library Version: @VERSION@ -Requires: @GTK_PACKAGES@ +Requires: gdk-@GTK_API_VERSION@ @GTK_PACKAGES@ Libs: -L${libdir} -lgtk-@GTK_API_VERSION@ @GTK_EXTRA_LIBS@ Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GTK_EXTRA_CFLAGS@ -DGSEAL_ENABLE |