]>
Commit | Line | Data |
---|---|---|
9523ae52 JB |
1 | diff -Nur XmHTML-1.1.7.orig/configure.in XmHTML-1.1.7/configure.in |
2 | --- XmHTML-1.1.7.orig/configure.in Wed Feb 3 17:19:48 1999 | |
3 | +++ XmHTML-1.1.7/configure.in Sat Mar 17 22:55:03 2001 | |
4 | @@ -712,32 +712,12 @@ | |
5 | fi | |
6 | ]) | |
7 | ||
8 | -AC_DEFUN(AM_MAINTAINER_MODE, | |
9 | -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) | |
10 | - dnl maintainer-mode is disabled by default | |
11 | - AC_ARG_ENABLE(maintainer-mode, | |
12 | -[ --enable-maintainer-mode enable make rules and dependencies not useful | |
13 | - (and sometimes confusing) to the casual installer], | |
14 | - USE_MAINTAINER_MODE=$enableval, | |
15 | - USE_MAINTAINER_MODE=no) | |
16 | - AC_MSG_RESULT($USE_MAINTAINER_MODE) | |
17 | - if test $USE_MAINTAINER_MODE = yes; then | |
18 | - MAINT= | |
19 | - else | |
20 | - MAINT='#M#' | |
21 | - fi | |
22 | - AC_SUBST(MAINT)dnl | |
23 | -] | |
24 | -) | |
25 | - | |
26 | dnl | |
27 | dnl End of special macros. | |
28 | dnl | |
29 | ||
30 | -AM_CYGWIN32 | |
31 | -AM_EMX | |
32 | +AC_CYGWIN | |
33 | AM_WITH_DMALLOC | |
34 | -AM_MAINTAINER_MODE | |
35 | ||
36 | AC_MSG_CHECKING(compiler flags) | |
9254d4b9 JB |
37 | dnl |
38 | @@ -810,17 +811,8 @@ | |
39 | dnl Which output files do we generate ? | |
40 | dnl | |
41 | ||
42 | -AC_OUTPUT(Makefile | |
706df2f9 | 43 | +AC_OUTPUT(Makefile |
9254d4b9 JB |
44 | -book/Makefile |
45 | -contrib/Makefile | |
46 | -examples/Makefile | |
47 | -http/Makefile | |
48 | lib/Makefile | |
49 | -lib/common/Makefile | |
50 | -lib/compat/Makefile | |
51 | -lib/Motif/Makefile | |
52 | -lib/gtk/Makefile | |
53 | -tools/Makefile | |
54 | ) | |
55 | ||
9523ae52 | 56 | dnl |
706df2f9 JB |
57 | --- XmHTML-1.1.10/lib/Makefile.am.orig 2015-10-26 11:22:55.111545877 +0100 |
58 | +++ XmHTML-1.1.10/lib/Makefile.am 2018-05-13 11:22:53.264190849 +0200 | |
59 | @@ -7,14 +7,29 @@ | |
9523ae52 JB |
60 | |
61 | lib_LTLIBRARIES=libXmHTML.la | |
62 | ||
63 | -libXmHTML_la_LDFLAGS= | |
706df2f9 JB |
64 | -libXmHTML_la_SOURCES= \ |
65 | - XmHTML.c Balloon.c XmImage.c fonts.c callbacks.c events.c frames.c \ | |
66 | - forms.c StringUtil.c parse.c format.c layout.c paint.c colors.c \ | |
67 | - images.c readBitmap.c readFLG.c readGIF.c readGIFplc.c readXPM.c \ | |
68 | - readJPEG.c readJPEGplc.c readPNG.c map.c XCC.c quantize.c \ | |
69 | - LZWStream.c plc.c error.c strings.c textsel.c output.c motif.c \ | |
9523ae52 | 70 | - public.c warnings.c private.c stack.c |
706df2f9 JB |
71 | +libXmHTML_la_LIBADD=-lXm -lX11 -lXext -lXt -lXpm -ljpeg -lpng -lz |
72 | +# COMMONSRCS from common/Makefile (with common/ prefix) | |
73 | +common_srcs= \ | |
74 | + common/events.c common/hash.c common/stack.c common/format.c common/fonts.c common/paint.c common/readXPM.c \ | |
75 | + common/readJPEGplc.c common/quantize.c common/colors.c common/private.c common/readBitmap.c common/public.c \ | |
76 | + common/readPNG.c common/readGIFplc.c common/readGIF.c common/error.c common/callbacks.c common/StringUtil.c \ | |
77 | + common/images.c common/readFLG.c common/readJPEG.c common/parse.c common/map.c common/layout.c common/LZWStream.c \ | |
78 | + common/psoutput.c | |
79 | +# MOTIFSRCS from Motif/Makefile (with Motif/ prefix) | |
80 | +motif_srcs= \ | |
81 | + Motif/motif.c Motif/XmHTML.c Motif/output.c Motif/XmImage.c Motif/plc.c Motif/frames.c Motif/textsel.c \ | |
82 | + Motif/forms.c Motif/XCC.c Motif/Balloon.c Motif/warnings.c Motif/strings.c | |
83 | + XmHTML.c Balloon.c XmImage.c fonts.c callbacks.c events.c frames.c | |
84 | +libXmHTML_la_SOURCES= $(common_srcs) $(motif_srcs) | |
85 | +common_hdrs= \ | |
86 | + ../include/common/LZWStream.h | |
87 | +motif_hdrs= \ | |
88 | + ../include/XmHTML/Balloon.h \ | |
89 | + ../include/XmHTML/HTML.h \ | |
90 | + ../include/XmHTML/HTMLStrings.h \ | |
91 | + ../include/XmHTML/XCC.h \ | |
92 | + ../include/XmHTML/XmHTML.h | |
93 | +pkginclude_HEADERS = $(common_hdrs) $(motif_hdrs) | |
9523ae52 JB |
94 | |
95 | if NLIBJPEG | |
96 | JPEGINC = | |
706df2f9 JB |
97 | @@ -36,5 +51,5 @@ |
98 | ||
99 | IMAGEINC= $(JPEGINC) $(PNGINC) $(ZLIBINC) | |
100 | ||
101 | -INCLUDES= -I$(top_srcdir)/include ${X_CFLAGS} -I@motif_includes@ $(IMAGEINC) | |
102 | +INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/include/XmHTML -I$(top_srcdir)/include/common ${X_CFLAGS} -I@motif_includes@ $(IMAGEINC) | |
103 |