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 /demos/gtk-demo | |
| 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 'demos/gtk-demo')
| -rw-r--r-- | demos/gtk-demo/Makefile.am | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am index 43b706e7ed..1a5a6770a5 100644 --- a/demos/gtk-demo/Makefile.am +++ b/demos/gtk-demo/Makefile.am @@ -55,13 +55,11 @@ INCLUDES = \ $(GTK_DEP_CFLAGS) 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) \ - $(GTK_DEP_LIBS) \ + $(top_builddir)/gtk/libgtk-3.0.la \ + $(GTK_DEP_LIBS) \ -lm bin_PROGRAMS = gtk3-demo |