diff options
| author | David Tardon <dtardon@redhat.com> | 2011-12-01 13:39:09 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-12-05 15:11:52 +0100 |
| commit | adb110517139252962b1ccf8f9230a4981a9573a (patch) | |
| tree | 2a6ac2d1b9069d6c6e551ccfa72fc60cd019e987 /vcl/Library_vclplug_gtk.mk | |
| parent | 85c6244b85b29c1d2bb9d89b62e9512dd65378b5 (diff) | |
set up CFLAGS/LIBS for gtk print dialog in configure
The dialog is built for gtk 2.0 if the version present at the system is
at least 2.10.0 and always for gtk 3.0.
Diffstat (limited to 'vcl/Library_vclplug_gtk.mk')
| -rw-r--r-- | vcl/Library_vclplug_gtk.mk | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index d6e67bf9f4e0..657844d50250 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -28,7 +28,6 @@ $(eval $(call gb_Library_Library,vclplug_gtk)) -# TODO: move the pkg-config stuff to configure $(eval $(call gb_Library_set_include,vclplug_gtk,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ @@ -36,7 +35,6 @@ $(eval $(call gb_Library_set_include,vclplug_gtk,\ -I$(SRCDIR)/vcl/unx/gtk/inc \ -I$(SRCDIR)/solenv/inc \ -I$(OUTDIR)/inc \ - $(shell pkg-config --cflags gtk+-unix-print-2.0) \ )) $(eval $(call gb_Library_add_defs,vclplug_gtk,\ @@ -72,10 +70,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_add_libs,vclplug_gtk,\ - $(shell pkg-config --libs gtk+-unix-print-2.0) \ -)) - $(eval $(call gb_Library_use_externals,vclplug_gtk,\ dbus \ gtk \ @@ -105,9 +99,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\ vcl/unx/gtk/app/gtkdata \ vcl/unx/gtk/app/gtkinst \ vcl/unx/gtk/app/gtksys \ - vcl/unx/gtk/gdi/gtkprintwrapper \ vcl/unx/gtk/gdi/salnativewidgets-gtk \ - vcl/unx/gtk/gdi/salprn-gtk \ vcl/unx/gtk/window/gtkframe \ vcl/unx/gtk/window/gtkobject \ vcl/unx/gtk/fpicker/resourceprovider \ @@ -116,6 +108,13 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\ vcl/unx/gtk/fpicker/SalGtkFolderPicker \ )) +ifeq ($(ENABLE_GTK_PRINT),TRUE) +$(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\ + vcl/unx/gtk/gdi/gtkprintwrapper \ + vcl/unx/gtk/gdi/salprn-gtk \ +)) +endif + ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\ dl \ |