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/input | |
| 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/input')
| -rw-r--r-- | modules/input/Makefile.am | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index 019b52b182..72c2029f2b 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -17,12 +17,10 @@ INCLUDES = \ $(INCLUDED_IMMODULE_DEFINE) DEPS = \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) + $(top_builddir)/gtk/libgtk-3.0.la LDADDS = \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) \ + $(top_builddir)/gtk/libgtk-3.0.la \ $(GTK_DEP_LIBS) moduledir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/immodules |