diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-12-08 23:07:00 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-12-21 12:06:55 -0500 |
| commit | 07d49ee56a4ce86d9d6154e00ff6b10bd3bdc2a4 (patch) | |
| tree | 1b90702b472ced7ca391f34df2c110f8d0e6aaa7 /modules/printbackends | |
| parent | ae146a281750926eee6c5fafb88414999ffa6821 (diff) | |
| download | gtk+-07d49ee56a4ce86d9d6154e00ff6b10bd3bdc2a4.tar.gz | |
Merge libgdk and libgtk
This commit does a number of things:
- remove some dead wchar configury from configure.ac and gdkconfig.h
- repurpose gdkconfig.h as header that contains GDK_WINDOWING_foo
macros for each included backend, include it in gdk.h and install
it in $includedir instead of below $libdir
- drop the backend from the library names
- build libgdk-3.0.la as a convenience lib and include it in libgtk-3.0.la
It does not yet enable building multiple backends at the same time.
Diffstat (limited to 'modules/printbackends')
| -rw-r--r-- | modules/printbackends/cups/Makefile.am | 3 | ||||
| -rw-r--r-- | modules/printbackends/file/Makefile.am | 3 | ||||
| -rw-r--r-- | modules/printbackends/lpr/Makefile.am | 4 | ||||
| -rw-r--r-- | modules/printbackends/papi/Makefile.am | 4 | ||||
| -rw-r--r-- | modules/printbackends/test/Makefile.am | 2 |
5 files changed, 7 insertions, 9 deletions
diff --git a/modules/printbackends/cups/Makefile.am b/modules/printbackends/cups/Makefile.am index de4d77477d..54feaac16a 100644 --- a/modules/printbackends/cups/Makefile.am +++ b/modules/printbackends/cups/Makefile.am @@ -16,8 +16,7 @@ INCLUDES = \ $(GTK_DEBUG_FLAGS) LDADDS = \ - $(top_builddir)/gtk/$(gtktargetlib) \ - $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/libgtk-3.0.la \ $(GTK_DEP_LIBS) backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends diff --git a/modules/printbackends/file/Makefile.am b/modules/printbackends/file/Makefile.am index 30469e981b..402ae34379 100644 --- a/modules/printbackends/file/Makefile.am +++ b/modules/printbackends/file/Makefile.am @@ -28,8 +28,7 @@ libprintbackend_file_la_LDFLAGS = \ -avoid-version -module $(no_undefined) libprintbackend_file_la_LIBADD = \ - $(top_builddir)/gtk/$(gtktargetlib) \ - $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/libgtk-3.0.la \ $(GTK_DEP_LIBS) noinst_HEADERS = \ diff --git a/modules/printbackends/lpr/Makefile.am b/modules/printbackends/lpr/Makefile.am index 379fa4964a..8142b6827b 100644 --- a/modules/printbackends/lpr/Makefile.am +++ b/modules/printbackends/lpr/Makefile.am @@ -15,8 +15,8 @@ INCLUDES = \ $(GTK_DEBUG_FLAGS) LDADDS = \ - $(GTK_DEP_LIBS) \ - $(top_builddir)/gtk/$(gtktargetlib) + $(top_builddir)/gtk/libgtk-3.0.la \ + $(GTK_DEP_LIBS) backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends diff --git a/modules/printbackends/papi/Makefile.am b/modules/printbackends/papi/Makefile.am index 671055be59..c67d8b251e 100644 --- a/modules/printbackends/papi/Makefile.am +++ b/modules/printbackends/papi/Makefile.am @@ -13,8 +13,8 @@ INCLUDES = \ $(GTK_DEBUG_FLAGS) LDADDS = \ - $(GTK_DEP_LIBS) \ - $(top_builddir)/gtk/$(gtktargetlib) + $(top_builddir)/gtk/libgtk-3.0.la \ + $(GTK_DEP_LIBS) backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends diff --git a/modules/printbackends/test/Makefile.am b/modules/printbackends/test/Makefile.am index 2f61165e0e..822514fe46 100644 --- a/modules/printbackends/test/Makefile.am +++ b/modules/printbackends/test/Makefile.am @@ -28,7 +28,7 @@ libprintbackend_test_la_LDFLAGS = \ -avoid-version -module $(no_undefined) libprintbackend_test_la_LIBADD = \ - $(top_builddir)/gtk/$(gtktargetlib) \ + $(top_builddir)/gtk/libgtk-3.0.la \ $(GTK_DEP_LIBS) noinst_HEADERS = \ |