Commit e1c4314a authored by Michael Natterer's avatar Michael Natterer 😴

Bug 757687 - Screenshot functionality broken under Wayland

Move the screenshot plug-in to its own directory, it's about to be
split up into multiple files.
parent 011c6db3
......@@ -1906,11 +1906,9 @@ AM_CONDITIONAL(BUILD_SCRIPT_FU, test "x$with_script_fu" != "xno")
if test "x$os_win32" = xno; then
MAIL='mail$(EXEEXT)'
SCREENSHOT='screenshot$(EXEEXT)'
fi
AC_SUBST(MAIL)
AC_SUBST(SCREENSHOT)
####################
......@@ -2333,6 +2331,7 @@ plug-ins/pagecurl/Makefile
plug-ins/print/Makefile
plug-ins/pygimp/Makefile
plug-ins/pygimp/plug-ins/Makefile
plug-ins/screenshot/Makefile
plug-ins/script-fu/Makefile
plug-ins/script-fu/ftx/Makefile
plug-ins/script-fu/scripts/Makefile
......
......@@ -27,6 +27,8 @@ endif
if OS_WIN32
twain = twain
win_snap = win-snap
else
screenshot = screenshot
endif
SUBDIRS = \
......@@ -54,6 +56,7 @@ SUBDIRS = \
map-object \
pagecurl \
$(print) \
$(screenshot) \
selection-to-path \
$(twain) \
ui \
......
......@@ -168,8 +168,6 @@
/ripple.exe
/sample-colorize
/sample-colorize.exe
/screenshot
/screenshot.exe
/sharpen
/sharpen.exe
/smooth-palette
......
......@@ -127,7 +127,6 @@ libexec_PROGRAMS = \
qbist \
ripple \
sample-colorize \
$(SCREENSHOT) \
sharpen \
smooth-palette \
softglow \
......@@ -156,7 +155,6 @@ EXTRA_PROGRAMS = \
file-xmc \
file-xpm \
mail \
screenshot \
web-page
install-%: %
......@@ -1637,27 +1635,6 @@ sample_colorize_LDADD = \
$(INTLLIBS) \
$(sample_colorize_RC)
screenshot_CFLAGS = $(XFIXES_CFLAGS)
screenshot_SOURCES = \
screenshot.c
screenshot_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
$(libgimp) \
$(libgimpmath) \
$(libgimpconfig) \
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
$(GEGL_LIBS) \
$(SCREENSHOT_LIBS) \
$(RT_LIBS) \
$(INTLLIBS) \
$(screenshot_RC)
sharpen_SOURCES = \
sharpen.c
......
......@@ -81,7 +81,6 @@ procedure_browser_RC = procedure-browser.rc.o
qbist_RC = qbist.rc.o
ripple_RC = ripple.rc.o
sample_colorize_RC = sample-colorize.rc.o
screenshot_RC = screenshot.rc.o
sharpen_RC = sharpen.rc.o
smooth_palette_RC = smooth-palette.rc.o
softglow_RC = softglow.rc.o
......
......@@ -82,7 +82,6 @@
'qbist' => { ui => 1 },
'ripple' => { ui => 1 },
'sample-colorize' => { ui => 1 },
'screenshot' => { ui => 1, optional => 1, libs => 'SCREENSHOT_LIBS', cflags => 'XFIXES_CFLAGS', gegl => 1 },
'sharpen' => { ui => 1 },
'smooth-palette' => { ui => 1 },
'softglow' => { ui => 1 },
......
/Makefile.in
/Makefile
/screenshot
/screenshot.exe
/.libs
/.deps
## Process this file with automake to produce Makefile.in
libgimpui = $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la
libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
if OS_WIN32
mwindows = -mwindows
endif
if HAVE_WINDRES
include $(top_srcdir)/build/windows/gimprc-plug-ins.rule
screenshot_RC = screenshot.rc.o
endif
AM_LDFLAGS = $(mwindows)
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \
$(XFIXES_CFLAGS) \
-I$(includedir)
LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpconfig) \
$(libgimp) \
$(libgimpcolor) \
$(libgimpmath) \
$(libgimpbase) \
$(GTK_LIBS) \
$(GEGL_LIBS) \
$(SCREENSHOT_LIBS) \
$(RT_LIBS) \
$(INTLLIBS) \
$(screenshot_RC)
libexecdir = $(gimpplugindir)/plug-ins
libexec_PROGRAMS = screenshot
EXTRA_PROGRAMS = screenshot
screenshot_SOURCES = \
screenshot.c
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment