X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Fplugins%2Flitehtml_viewer%2FMakefile.am;h=f91ea5926b9e2394a5d7c088c4064a460766a8fd;hp=27179744331fb5d76f2fba8bf6ab28f9f5fbf7e3;hb=HEAD;hpb=ac781b594702f1b06b7b24e188c10126f515a09e

diff --git a/src/plugins/litehtml_viewer/Makefile.am b/src/plugins/litehtml_viewer/Makefile.am
index 271797443..31c895e3a 100644
--- a/src/plugins/litehtml_viewer/Makefile.am
+++ b/src/plugins/litehtml_viewer/Makefile.am
@@ -1,27 +1,26 @@
-# Copyright 1999-2018 the Claws Mail team.
+# Copyright 1999-2022 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
 
+include $(srcdir)/../win_plugin.mk
+
 SUBDIRS = litehtml
-EXTRA_DIST = claws.def plugin.def version.rc css.inc
 
 IFLAGS = \
-        -I$(top_srcdir)/src \
-        -I$(top_srcdir)/src/common \
-        -I$(top_builddir)/src \
-        -I$(top_srcdir)/src/gtk \
+	-I$(top_builddir)/src \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/common \
+	-I$(top_srcdir)/src/gtk \
 	-I$(top_srcdir)/src/plugins/litehtml_viewer/litehtml
 
-plugin_res =
-plugin_res_ldflag =
-export_symbols =
-plugin_deps =
-plugin_ldadd =
+plugin_cppflags =
+
+if OS_WIN32
 
-no_undefined =
+plugin_cppflags += -DLITEHTML_UTF8
 
-cygwin_export_lib =
+endif
 
 plugindir = $(pkglibdir)/plugins
 
@@ -29,41 +28,23 @@ if BUILD_LITEHTML_VIEWER_PLUGIN
 plugin_LTLIBRARIES = litehtml_viewer.la
 endif
 
-litehtml_viewer_la_DEPENDENCIES = $(plugin_deps)
-
-litehtml_viewer_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
-	$(top_builddir)/src/plugins/litehtml_viewer/litehtml/liblitehtml.la \
-        $(GTK_LIBS)
-
-litehtml_viewer_la_CXXFLAGS = -std=c++11
-litehtml_viewer_la_CFLAGS = -std=c99
+litehtml_viewer_la_LDFLAGS = \
+	$(plugin_ldflags) \
+	-avoid-version -module -z noexecstack
 
-litehtml_viewer_la_SOURCES = \
-	container_linux.cpp \
-	container_linux_images.cpp \
-	plugin.c \
-	lh_prefs.c \
-	lh_viewer.c \
-	lh_widget.cpp \
-	lh_widget_text.cpp \
-	container_linux.h \
-	lh_prefs.h \
-	lh_viewer.h \
-	lh_widget.h \
-	lh_widget_wrapped.h \
-	http.h \
-	http.cpp
+EXTRA_litehtml_viewer_la_DEPENDENCIES = $(plugin_extra_deps) \
+	litehtml/liblitehtml.la
 
-litehtml_viewer_la_LDFLAGS = \
-	$(plugin_res_ldflag) $(no_undefined) $(export_symbols) \
-	-avoid-version -module \
+litehtml_viewer_la_LIBADD = $(plugin_libadd) \
 	$(GTK_LIBS) \
 	$(FONTCONFIG_LIBS) \
 	$(CAIRO_LIBS) \
 	$(CURL_LIBS) \
-	$(LIBGUMBO_LIBS)
+	$(LIBGUMBO_LIBS) \
+	litehtml/liblitehtml.la
 
 litehtml_viewer_la_CPPFLAGS = \
+	$(plugin_cppflags) \
 	$(IFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
@@ -73,5 +54,23 @@ litehtml_viewer_la_CPPFLAGS = \
 	$(CURL_CFLAGS) \
 	$(LIBGUMBO_CFLAGS)
 
-.PHONY: test
+litehtml_viewer_la_CXXFLAGS = -std=c++11
+litehtml_viewer_la_CFLAGS = -std=c99
 
+litehtml_viewer_la_SOURCES = \
+	container_linux.cpp \
+	container_linux.h \
+	container_linux_images.cpp \
+	container_linux_images.h \
+	http.cpp \
+	http.h \
+	lh_prefs.c \
+	lh_prefs.h \
+	lh_viewer.c \
+	lh_viewer.h \
+	lh_widget.cpp \
+	lh_widget.h \
+	lh_widget_wrapped.h \
+	plugin.c
+
+.PHONY: test