diff options
| author | Ted Gould <ted@gould.cx> | 2010-11-11 11:28:43 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-11-11 11:28:43 -0600 |
| commit | d69f09d8320fbd3c4e06a6b96d6b3f77f41b6ffa (patch) | |
| tree | bc30d10509e8f2814ea6c7e39fe2c9154df353e1 /tools/testapp | |
| parent | 6e1734e1ad6ea13270afc6c9730d3e4ded2cda02 (diff) | |
| parent | f0c24c976f319d0b087adc0c8bc694cf930aa30b (diff) | |
| download | libdbusmenu-d69f09d8320fbd3c4e06a6b96d6b3f77f41b6ffa.tar.gz libdbusmenu-d69f09d8320fbd3c4e06a6b96d6b3f77f41b6ffa.tar.bz2 libdbusmenu-d69f09d8320fbd3c4e06a6b96d6b3f77f41b6ffa.zip | |
* New upstream release.
* Adding build support for GTK2/3 builds
* Only force a flush of top level items, allow others to be
based on the count.
Diffstat (limited to 'tools/testapp')
| -rw-r--r-- | tools/testapp/Makefile.am | 8 | ||||
| -rw-r--r-- | tools/testapp/Makefile.in | 13 |
2 files changed, 12 insertions, 9 deletions
diff --git a/tools/testapp/Makefile.am b/tools/testapp/Makefile.am index a8b42dd..39de532 100644 --- a/tools/testapp/Makefile.am +++ b/tools/testapp/Makefile.am @@ -1,4 +1,10 @@ +if USE_GTK3 +VER=3 +else +VER= +endif + libexec_PROGRAMS = dbusmenu-testapp dbusmenu_testapp_SOURCES = \ @@ -12,6 +18,6 @@ dbusmenu_testapp_CFLAGS = \ dbusmenu_testapp_LDADD = \ $(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \ - $(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk.la \ + $(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \ $(DBUSMENUGTK_LIBS) \ $(DBUSMENUTESTS_LIBS) diff --git a/tools/testapp/Makefile.in b/tools/testapp/Makefile.in index 94af85f..8a7a441 100644 --- a/tools/testapp/Makefile.in +++ b/tools/testapp/Makefile.in @@ -38,12 +38,7 @@ libexec_PROGRAMS = dbusmenu-testapp$(EXEEXT) subdir = tools/testapp DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -57,7 +52,7 @@ dbusmenu_testapp_OBJECTS = $(am_dbusmenu_testapp_OBJECTS) am__DEPENDENCIES_1 = dbusmenu_testapp_DEPENDENCIES = \ $(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \ - $(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk.la \ + $(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) @@ -264,6 +259,8 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +@USE_GTK3_FALSE@VER = +@USE_GTK3_TRUE@VER = 3 dbusmenu_testapp_SOURCES = \ main.c @@ -275,7 +272,7 @@ dbusmenu_testapp_CFLAGS = \ dbusmenu_testapp_LDADD = \ $(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \ - $(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk.la \ + $(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \ $(DBUSMENUGTK_LIBS) \ $(DBUSMENUTESTS_LIBS) |