diff -Nur XmHTML-1.1.7.orig/configure.in XmHTML-1.1.7/configure.in
--- XmHTML-1.1.7.orig/configure.in	Wed Feb  3 17:19:48 1999
+++ XmHTML-1.1.7/configure.in	Sat Mar 17 22:55:03 2001
@@ -712,32 +712,12 @@
 fi
 ])
 
-AC_DEFUN(AM_MAINTAINER_MODE,
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  if test $USE_MAINTAINER_MODE = yes; then
-    MAINT=
-  else
-    MAINT='#M#'
-  fi
-  AC_SUBST(MAINT)dnl
-]
-)
-
 dnl
 dnl End of special macros.
 dnl
 
-AM_CYGWIN32
-AM_EMX
+AC_CYGWIN
 AM_WITH_DMALLOC
-AM_MAINTAINER_MODE
 
 AC_MSG_CHECKING(compiler flags)
 dnl
@@ -810,17 +811,8 @@
 dnl Which output files do we generate ?
 dnl
 
-AC_OUTPUT(Makefile
+AC_OUTPUT(Makefile
-book/Makefile
-contrib/Makefile
-examples/Makefile
-http/Makefile
 lib/Makefile
-lib/common/Makefile
-lib/compat/Makefile
-lib/Motif/Makefile
-lib/gtk/Makefile
-tools/Makefile
 )
 
 dnl
--- XmHTML-1.1.10/lib/Makefile.am.orig	2015-10-26 11:22:55.111545877 +0100
+++ XmHTML-1.1.10/lib/Makefile.am	2018-05-13 11:22:53.264190849 +0200
@@ -7,14 +7,29 @@
 
 lib_LTLIBRARIES=libXmHTML.la
 
-libXmHTML_la_LDFLAGS=
-libXmHTML_la_SOURCES= \
-	XmHTML.c Balloon.c XmImage.c fonts.c callbacks.c events.c frames.c \
-	forms.c StringUtil.c parse.c format.c layout.c paint.c colors.c \
-	images.c readBitmap.c readFLG.c readGIF.c readGIFplc.c readXPM.c \
-	readJPEG.c readJPEGplc.c readPNG.c map.c XCC.c quantize.c \
-	LZWStream.c plc.c error.c strings.c textsel.c output.c motif.c \
-	public.c warnings.c private.c stack.c
+libXmHTML_la_LIBADD=-lXm -lX11 -lXext -lXt -lXpm -ljpeg -lpng -lz
+# COMMONSRCS from common/Makefile (with common/ prefix)
+common_srcs= \
+	common/events.c common/hash.c common/stack.c common/format.c common/fonts.c common/paint.c common/readXPM.c \
+	common/readJPEGplc.c common/quantize.c common/colors.c common/private.c common/readBitmap.c common/public.c \
+	common/readPNG.c common/readGIFplc.c common/readGIF.c common/error.c common/callbacks.c common/StringUtil.c \
+	common/images.c common/readFLG.c common/readJPEG.c common/parse.c common/map.c common/layout.c common/LZWStream.c \
+	common/psoutput.c
+# MOTIFSRCS from Motif/Makefile (with Motif/ prefix)
+motif_srcs= \
+	Motif/motif.c Motif/XmHTML.c Motif/output.c Motif/XmImage.c Motif/plc.c Motif/frames.c Motif/textsel.c \
+	Motif/forms.c Motif/XCC.c Motif/Balloon.c Motif/warnings.c Motif/strings.c
+	XmHTML.c Balloon.c XmImage.c fonts.c callbacks.c events.c frames.c
+libXmHTML_la_SOURCES= $(common_srcs) $(motif_srcs)
+common_hdrs= \
+	../include/common/LZWStream.h
+motif_hdrs= \
+	../include/XmHTML/Balloon.h \
+	../include/XmHTML/HTML.h \
+	../include/XmHTML/HTMLStrings.h \
+	../include/XmHTML/XCC.h \
+	../include/XmHTML/XmHTML.h
+pkginclude_HEADERS = $(common_hdrs) $(motif_hdrs)
 
 if NLIBJPEG
 JPEGINC =
@@ -36,5 +51,5 @@
 
 IMAGEINC= $(JPEGINC) $(PNGINC) $(ZLIBINC)
 
-INCLUDES= -I$(top_srcdir)/include ${X_CFLAGS} -I@motif_includes@ $(IMAGEINC)
+INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/include/XmHTML -I$(top_srcdir)/include/common ${X_CFLAGS} -I@motif_includes@ $(IMAGEINC)