Attachment #166888 for bug #204201




# $FreeBSD: head/x11-toolkits/xmhtml/Makefile 408637 2016-02-10 16:54:47Z amdmi3 $

PORTNAME=	XmHTML
PORTVERSION=	1.1.10
PORTREVISION=	3
CATEGORIES=	x11-toolkits www
MASTER_SITES=	SF/${PORTNAME:tl}


		libXmHTML.la ${STAGEDIR}${PREFIX}/lib)
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libXmHTML.so
	@${MKDIR} ${STAGEDIR}${PREFIX}/include/XmHTML
	(cd ${WRKSRC}/include/XmHTML && ${INSTALL_DATA} *.h \
		${STAGEDIR}${PREFIX}/include/XmHTML)

post-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	@(cd ${WRKSRC}/html && ${COPYTREE_SHARE} . \
		${CPIO} --quiet -dump -R ${SHAREOWN}:${SHAREGRP} \
		${STAGEDIR}${DOCSDIR})

post-install-EXAMPLES-on:
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
.for i in book contrib examples
	@(cd ${WRKSRC} && ${FIND} ${i} ! -name "*Makefile*" | \
		${CPIO} --quiet -dump -R ${SHAREOWN}:${SHAREGRP} \
		${STAGEDIR}${EXAMPLESDIR})
.endfor

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)x11-toolkits/xmhtml/distinfo (-2 / +2 lines)
1	SHA256 (XmHTML-1.1.9.tgz) = 264da26421a612e4cb05a75d874785b843afe2ce7598260ec19cedeb32628da2	1	SHA256 (XmHTML-1.1.10.tgz) = 379542629958d70a61a49955f44833e215c82500d6bdcc12d4e7252deefe0435
2	SIZE (XmHTML-1.1.9.tgz) = 1349743	2	SIZE (XmHTML-1.1.10.tgz) = 1348388




--- Makefile.orig	2015-10-26 10:22:55 UTC
+++ Makefile
@@ -61,7 +61,7 @@ HAVE_XPM=1
 ifeq ($(OS),IRIX)
 SUBDIRS= lib http
 else
-SUBDIRS= lib http examples tools
+SUBDIRS= lib http
 endif
 
 # some common definitions
@@ -81,7 +81,7 @@ RANLIB = ranlib
 endif
 RANLIB= ranlib
 
 SHELL = /bin/sh
-MAKE  = make 
+#MAKE  = make 
 # change this to makedepend if your system doesn't have gcc
 MAKEDEPEND= gccmakedep
 
@@ -99,9 +99,9 @@ endif
 # Compiler Settings #
 #                   #
 #####################
-CC       	= gcc
-CFLAGS   	= -funroll-loops -Wall -pipe -ansi -fPIC $(OS_CFLAGS) $(EXTRA_CFLAGS)
-LDFLAGS  	= 
+#CC       	= gcc
+#CFLAGS   	= -funroll-loops -Wall -pipe -ansi -fPIC $(OS_CFLAGS) $(EXTRA_CFLAGS)
+#LDFLAGS  	= 
 
 # The following flags are *very* usefull if you are getting unresolved
 # references to functions in libraries that you *know* to exist.
@@ -160,7 +160,7 @@ endif
 # HAVE_LIBZ => zlib.h
 
 ZLIBINC       =

 
 # Image libraries
 # No need to add -lXpm if you need to include it with LIBS below
@@ -171,7 +171,7 @@ IMAGEINCLUDES = $(ZLIBINC)
 # HAVE_LIBZ => libz (and possibly libm)
 
 ZLIBLIB   = -lz -lm
-IMAGELIBS = -ljpeg -lpng $(ZLIBLIB)
+IMAGELIBS = `libpng-config --libs` -L${LOCALBASE}/lib -ljpeg $(LDFLAGS)
 
 # It might be troublesome to know what the correct defines are for your
 # system. A possible set of defines for some OS's is given below. Pick
@@ -211,7 +211,7 @@ IMAGELIBS = -ljpeg -lpng $(ZLIBLIB)
 # Add -DDEBUG to enable selective debug output (see the file DEBUGGING for more
 # info).
 #

 	$(EXTRA_CPPFLAGS) \
 	$(IMAGEDEFINES) \
 	$(XFT_DEFINES)
@@ -224,7 +224,7 @@ ifeq ($(TOOLKIT),Motif)
 ifeq ($(OS),IRIX)
 TOOLKITINC=-I../../include/XmHTML -I/usr/include
 else
-TOOLKITINC=-I../../include/XmHTML -I/usr/X11R6/include -I/usr/include/freetype2
+TOOLKITINC=-I../../include/XmHTML `pkg-config --cflags xft`
 endif
 else
 ifeq ($(TOOLKIT),gtk)
@@ -250,7 +250,7 @@ ifeq ($(TOOLKIT),Motif)
 ifeq ($(OS),IRIX)
 LIBDIR = -L/usr/lib32
 else
 ifeq ($(PLATFORM),gtk)
 PLATFORMINC=\
@@ -209,7 +209,7 @@
 # Motif version (default)
 ifeq ($(PLATFORM),Motif)
 
-LIBDIR = -L/usr/X11R6/lib
+LIBDIR = -L${LOCALBASE}/lib
 endif
 # This is what is required under Linux (Motif 2.0.1).
 # Your mileage may vary.
 LIBS   = -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE 

Lines 1-6 Link Here

(-)x11-toolkits/xmhtml/files/patch-book__Makefile (-3 / +3 lines)
1	--- book/Makefile.orig	1	--- book/Makefile.orig 2015-10-26 10:22:55 UTC
2	+++ book/Makefile	2	+++ book/Makefile
3	@@ -12,13 +12,13 @@	3	@@ -12,13 +12,13 @@ EXAMPLES=simple_html simple_html2 autosi
4		4
5	# The library	5	# The library
6	XMHTMLINC= -I../lib	6	XMHTMLINC= -I../lib
Lines 16-22 Link Here
16		16
17	all: $(EXAMPLES)	17	all: $(EXAMPLES)
18		18
19	@@ -26,27 +26,27 @@	19	@@ -26,27 +26,27 @@ all: $(EXAMPLES)
20		20
21	simple_html:: ../src/libXmHTML.a simple_html.o	21	simple_html:: ../src/libXmHTML.a simple_html.o
22	$(RM) $@ \	22	$(RM) $@ \




--- examples/Makefile.orig	2015-10-26 10:22:55 UTC
+++ examples/Makefile
@@ -11,10 +11,10 @@ MOBJS= visual.o misc.o cache.o menu.o hi
 EXAMPLES=example_1 example_2 example_4
 
 # The XmHTML library

 
 # Libraries against which all examples are linked 
 LINKLIBS = $(XMHTMLLIB) $(LOADLIBES) $(DMALLOCLIB)
@@ -22,7 +22,7 @@ LINKLIBS = $(XMHTMLLIB) $(LOADLIBES) $(D
 # rule to create .o files from .c files 
 .c.o:
 	$(RM) $@

 
 all: $(EXAMPLES)
 
@@ -30,15 +30,15 @@ all: $(EXAMPLES)
 
 example_1::  ../src/libXmHTML.a example_1.o
 	$(RM) $@ \ 

Lines 1-4 Link Here

(-)x11-toolkits/xmhtml/files/patch-http__Makefile (-2 / +2 lines)
1	--- http/Makefile.orig	1	--- http/Makefile.orig 2015-10-26 10:22:55 UTC
2	+++ http/Makefile	2	+++ http/Makefile
3	@@ -2,7 +2,7 @@	3	@@ -2,7 +2,7 @@
4	# lint configuration. I use lclint.	4	# lint configuration. I use lclint.
Lines 9-15 Link Here
9	SHAREDLIB=libhttp.so.0	9	SHAREDLIB=libhttp.so.0
10	SONAME=libhttp.so.0	10	SONAME=libhttp.so.0
11		11
12	@@ -23,16 +23,15 @@	12	@@ -23,16 +23,15 @@ SUBDIRS=
13	# rule to create .o files from .c files	13	# rule to create .o files from .c files
14	.c.o:	14	.c.o:
15	$(RM) $@	15	$(RM) $@

Lines 1-6 Link Here

(-)x11-toolkits/xmhtml/files/patch-lib_Motif_Makefile (-3 / +3 lines)
1	--- lib/Motif/Makefile.orig 2009-07-12 11:26:03.000000000 -0500	1	--- lib/Motif/Makefile.orig 2015-10-26 10:22:55 UTC
2	+++ lib/Motif/Makefile 2009-07-12 11:26:33.000000000 -0500	2	+++ lib/Motif/Makefile
3	@@ -50,7 +50,7 @@	3	@@ -50,7 +50,7 @@ SUBDIRS=
4	# rule to create .o files from .c files	4	# rule to create .o files from .c files
5	.c.o:	5	.c.o:
6	$(RM) $@	6	$(RM) $@




--- lib/Makefile.orig	2015-10-26 10:22:55 UTC
+++ lib/Makefile
@@ -25,7 +25,7 @@
 # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.         #

-LIBRARY=libXmHTML.a
+LIBRARY=libXmHTML.la
 SHAREDLIB=libXmHTML.so.$(ARCHIVE)
 SONAME=$(basename $(SHAREDLIB))
 
 # Targets to make
@@ -36,7 +36,7 @@ TARGET_SHARED=$(SHAREDLIB)
 SUBDIRS= common $(TOOLKIT)
 
 # Target rules
-all:: $(TARGET_STATIC) $(TARGET_SHARED)
+all:: $(TARGET_STATIC)
 
 # Separate rules for all targets 
 $(TOOLKIT):: 
@@ -46,9 +46,9 @@ common::
 	@(set -x; cd common; $(MAKE) all $(pass_flags) )
 
 $(TARGET_STATIC):: common $(TOOLKIT) 
-	$(RM) $@ \ 
-	$(AR) $@ common/*.o $(TOOLKIT)/*.o
-	$(RANLIB) $@
+	$(RM) $@
+	$(LIBTOOL) --mode=link $(CC) -o $@ common/*.lo $(TOOLKIT)/*.lo \
+		-rpath ${PREFIX}/lib -version-info 1:2
 
 $(TARGET_SHARED):: common $(TOOLKIT) 
 	$(RM) $@ ; \

Lines 1-6 Link Here

(-)x11-toolkits/xmhtml/files/patch-lib_common_Makefile (-3 / +3 lines)
1	--- lib/common/Makefile.orig 2009-07-12 11:21:10.000000000 -0500	1	--- lib/common/Makefile.orig 2015-10-26 10:22:55 UTC
2	+++ lib/common/Makefile 2009-07-12 11:22:01.000000000 -0500	2	+++ lib/common/Makefile
3	@@ -56,7 +56,7 @@	3	@@ -56,7 +56,7 @@ SUBDIRS=
4	# rule to create .o files from .c files	4	# rule to create .o files from .c files
5	.c.o:	5	.c.o:
6	$(RM) $@	6	$(RM) $@

Lines 1-6 Link Here

(-)x11-toolkits/xmhtml/files/patch-lib_gtk_Makefile (-3 / +3 lines)
1	--- lib/gtk/Makefile.orig 2009-07-12 11:27:47.000000000 -0500	1	--- lib/gtk/Makefile.orig 2015-10-26 10:22:55 UTC
2	+++ lib/gtk/Makefile 2009-07-12 11:28:09.000000000 -0500	2	+++ lib/gtk/Makefile
3	@@ -50,7 +50,7 @@	3	@@ -50,7 +50,7 @@ SUBDIRS=
4	# rule to create .o files from .c files	4	# rule to create .o files from .c files
5	.c.o:	5	.c.o:
6	$(RM) $@	6	$(RM) $@




--- tools/Makefile.orig	2015-10-26 10:22:55 UTC
+++ tools/Makefile
@@ -39,7 +39,7 @@ TARGETS = reptype wsize gifinfo HTMLpars
 # rule to create .o files from .c files 
 .c.o:
 	$(RM) $@

 
 #
 # Special object rules
@@ -50,21 +50,21 @@ TARGETS = reptype wsize gifinfo HTMLpars
 #
 gif2gzf.o: gif2gzf.c
 	$(RM) $@

 
 #
 # All Targets
@@ -76,33 +76,33 @@ all: $(TARGETS)
 
 reptype::  GetRepTypes.o
 	$(RM) $@ \ 

Return to bug 204201

Lines 2-9 Link Here

(-)x11-toolkits/xmhtml/Makefile (-10 / +11 lines)
2	# $FreeBSD: head/x11-toolkits/xmhtml/Makefile 408637 2016-02-10 16:54:47Z amdmi3 $	2	# $FreeBSD: head/x11-toolkits/xmhtml/Makefile 408637 2016-02-10 16:54:47Z amdmi3 $
3		3
4	PORTNAME= XmHTML	4	PORTNAME= XmHTML
5	PORTVERSION= 1.1.9	5	PORTVERSION= 1.1.10
6	PORTREVISION= 3
7	CATEGORIES= x11-toolkits www	6	CATEGORIES= x11-toolkits www
8	MASTER_SITES= SF/${PORTNAME:tl}	7	MASTER_SITES= SF/${PORTNAME:tl}
9		8
Lines 29-46 Link Here
29	libXmHTML.la ${STAGEDIR}${PREFIX}/lib)	28	libXmHTML.la ${STAGEDIR}${PREFIX}/lib)
30	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libXmHTML.so	29	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libXmHTML.so
31	@${MKDIR} ${STAGEDIR}${PREFIX}/include/XmHTML	30	@${MKDIR} ${STAGEDIR}${PREFIX}/include/XmHTML
32	${INSTALL_DATA} ${WRKSRC}/include/XmHTML/*.h \	31	(cd ${WRKSRC}/include/XmHTML && ${INSTALL_DATA} *.h \
33	${STAGEDIR}${PREFIX}/include/XmHTML	32	${STAGEDIR}${PREFIX}/include/XmHTML)
34		33
35	do-install-DOCS-on:	34	post-install-DOCS-on:
36	@${MKDIR} ${STAGEDIR}${DOCSDIR}	35	@${MKDIR} ${STAGEDIR}${DOCSDIR}
37	@(cd ${WRKSRC}/html && ${FIND} . ! -name "Makefile" \| \	36	@(cd ${WRKSRC}/html && ${COPYTREE_SHARE} . \
38	${CPIO} --quiet -dump -R ${SHAREOWN}:${SHAREGRP} \
39	${STAGEDIR}${DOCSDIR})	37	${STAGEDIR}${DOCSDIR})
40		38
41	do-install-EXAMPLES-on:	39	post-install-EXAMPLES-on:
42	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	40	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
43	@cd ${WRKSRC} && ${COPYTREE_SHARE} "book contrib examples" \	41	.for i in book contrib examples
44	${STAGEDIR}${EXAMPLESDIR} "! -type d ! -name Makefile"	42	@(cd ${WRKSRC} && ${FIND} ${i} ! -name "Makefile" \| \
		43	${CPIO} --quiet -dump -R ${SHAREOWN}:${SHAREGRP} \
		44	${STAGEDIR}${EXAMPLESDIR})
		45	.endfor
45		46
46	.include <bsd.port.mk>	47	.include <bsd.port.mk>

Lines 1-37 Link Here

(-)x11-toolkits/xmhtml/files/patch-Makefile (-35 / +35 lines)
1	--- Makefile.orig	1	--- Makefile.orig 2015-10-26 10:22:55 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -46,7 +46,7 @@	3	@@ -61,7 +61,7 @@ HAVE_XPM=1
4	# remove the examples directory from this line.	4	ifeq ($(OS),IRIX)
5	# If you want to build the XmHTML tutorial examples, add the book directory.	5	SUBDIRS= lib http
6		6	else
7	-SUBDIRS= lib http examples tools	7	-SUBDIRS= lib http examples tools
8	+SUBDIRS= lib http	8	+SUBDIRS= lib http
		9	endif
9		10
10	# some common definitions	11	# some common definitions
11	#	12	@@ -81,7 +81,7 @@ RANLIB = ranlib
12	@@ -61,7 +61,7 @@	13	endif
13	RANLIB= ranlib
14		14
15	SHELL = /bin/sh	15	SHELL = /bin/sh
16	-MAKE = make	16	-MAKE = make
17	+#MAKE = make	17	+#MAKE = make
18	# change this to makedepend if your system doesn't have gcc	18	# change this to makedepend if your system doesn't have gcc
19	MAKEDEPEND= gccmakedep	19	MAKEDEPEND= gccmakedep
20		20
21	@@ -70,9 +70,9 @@	21	@@ -99,9 +99,9 @@ endif
22	# Compiler Settings #	22	# Compiler Settings #
23	# #	23	# #
24	#####################	24	#####################
25	-CC = gcc	25	-CC = gcc
26	-CFLAGS = -g -funroll-loops -Wall -pipe -ansi $(EXTRA_CFLAGS)	26	-CFLAGS = -funroll-loops -Wall -pipe -ansi -fPIC $(OS_CFLAGS) $(EXTRA_CFLAGS)
27	-LDFLAGS =	27	-LDFLAGS =
28	+#CC = gcc	28	+#CC = gcc
29	+#CFLAGS = -g -funroll-loops -Wall -pipe -ansi $(EXTRA_CFLAGS)	29	+#CFLAGS = -funroll-loops -Wall -pipe -ansi -fPIC $(OS_CFLAGS) $(EXTRA_CFLAGS)
30	+#LDFLAGS =	30	+#LDFLAGS =
31		31
32	# The following flags are very usefull if you are getting unresolved	32	# The following flags are very usefull if you are getting unresolved
33	# references to functions in libraries that you know to exist.	33	# references to functions in libraries that you know to exist.
34	@@ -125,7 +125,7 @@	34	@@ -160,7 +160,7 @@ endif
35	# HAVE_LIBZ => zlib.h	35	# HAVE_LIBZ => zlib.h
36		36
37	ZLIBINC =	37	ZLIBINC =
Lines 40-55 Link Here
40		40
41	# Image libraries	41	# Image libraries
42	# No need to add -lXpm if you need to include it with LIBS below	42	# No need to add -lXpm if you need to include it with LIBS below
43	@@ -136,7 +136,7 @@	43	@@ -171,7 +171,7 @@ IMAGEINCLUDES = $(ZLIBINC)
44	# HAVE_LIBZ => libz (and possibly libm)	44	# HAVE_LIBZ => libz (and possibly libm)
45		45
46	ZLIBLIB = -lz -lm	46	ZLIBLIB = -lz -lm
47	-IMAGELIBS = -ljpeg -lpng $(ZLIBLIB)	47	-IMAGELIBS = -ljpeg -lpng $(ZLIBLIB)
48	+IMAGELIBS = `libpng-config --libs` -L${LOCALBASE}/lib -ljpeg $(ZLIBLIB)	48	+IMAGELIBS = `libpng-config --libs` -L${LOCALBASE}/lib -ljpeg $(LDFLAGS)
49		49
50	# It might be troublesome to know what the correct defines are for your	50	# It might be troublesome to know what the correct defines are for your
51	# system. A possible set of defines for some OS's is given below. Pick	51	# system. A possible set of defines for some OS's is given below. Pick
52	@@ -176,7 +176,7 @@	52	@@ -211,7 +211,7 @@ IMAGELIBS = -ljpeg -lpng $(ZLIBLIB)
53	# Add -DDEBUG to enable selective debug output (see the file DEBUGGING for more	53	# Add -DDEBUG to enable selective debug output (see the file DEBUGGING for more
54	# info).	54	# info).
55	#	55	#
Lines 58-78 Link Here
58	$(EXTRA_CPPFLAGS) \	58	$(EXTRA_CPPFLAGS) \
59	$(IMAGEDEFINES) \	59	$(IMAGEDEFINES) \
60	$(XFT_DEFINES)	60	$(XFT_DEFINES)
61	@@ -186,7 +186,7 @@	61	@@ -224,7 +224,7 @@ ifeq ($(TOOLKIT),Motif)
62		62	ifeq ($(OS),IRIX)
63	# Platform specific includes	63	TOOLKITINC=-I../../include/XmHTML -I/usr/include
64	ifeq ($(PLATFORM),Motif)	64	else
65	-PLATFORMINC=-I../../include/XmHTML -I/usr/X11R6/include -I/usr/include/freetype2	65	-TOOLKITINC=-I../../include/XmHTML -I/usr/X11R6/include -I/usr/include/freetype2
66	+PLATFORMINC=-I../../include/XmHTML `pkg-config --cflags xft`	66	+TOOLKITINC=-I../../include/XmHTML `pkg-config --cflags xft`
		67	endif
		68	else
		69	ifeq ($(TOOLKIT),gtk)
		70	@@ -250,7 +250,7 @@ ifeq ($(TOOLKIT),Motif)
		71	ifeq ($(OS),IRIX)
		72	LIBDIR = -L/usr/lib32
67	else	73	else
68	ifeq ($(PLATFORM),gtk)
69	PLATFORMINC=\
70	@@ -209,7 +209,7 @@
71	# Motif version (default)
72	ifeq ($(PLATFORM),Motif)
73
74	-LIBDIR = -L/usr/X11R6/lib	74	-LIBDIR = -L/usr/X11R6/lib
75	+LIBDIR = -L${LOCALBASE}/lib	75	+LIBDIR = -L${LOCALBASE}/lib
		76	endif
76	# This is what is required under Linux (Motif 2.0.1).	77	# This is what is required under Linux (Motif 2.0.1).
77	# Your mileage may vary.	78	# Your mileage may vary.
78	LIBS = -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE

Lines 1-6 Link Here

(-)x11-toolkits/xmhtml/files/patch-examples__Makefile (-4 / +4 lines)
1	--- examples/Makefile.orig	1	--- examples/Makefile.orig 2015-10-26 10:22:55 UTC
2	+++ examples/Makefile	2	+++ examples/Makefile
3	@@ -11,10 +11,10 @@	3	@@ -11,10 +11,10 @@ MOBJS= visual.o misc.o cache.o menu.o hi
4	EXAMPLES=example_1 example_2 example_4	4	EXAMPLES=example_1 example_2 example_4
5		5
6	# The XmHTML library	6	# The XmHTML library
Lines 13-19 Link Here
13		13
14	# Libraries against which all examples are linked	14	# Libraries against which all examples are linked
15	LINKLIBS = $(XMHTMLLIB) $(LOADLIBES) $(DMALLOCLIB)	15	LINKLIBS = $(XMHTMLLIB) $(LOADLIBES) $(DMALLOCLIB)
16	@@ -22,7 +22,7 @@	16	@@ -22,7 +22,7 @@ LINKLIBS = $(XMHTMLLIB) $(LOADLIBES) $(D
17	# rule to create .o files from .c files	17	# rule to create .o files from .c files
18	.c.o:	18	.c.o:
19	$(RM) $@	19	$(RM) $@
Lines 22-28 Link Here
22		22
23	all: $(EXAMPLES)	23	all: $(EXAMPLES)
24		24
25	@@ -30,15 +30,15 @@	25	@@ -30,15 +30,15 @@ all: $(EXAMPLES)
26		26
27	example_1:: ../src/libXmHTML.a example_1.o	27	example_1:: ../src/libXmHTML.a example_1.o
28	$(RM) $@ \	28	$(RM) $@ \

Lines 1-4 Link Here

(-)x11-toolkits/xmhtml/files/patch-lib__Makefile (-10 / +10 lines)
1	--- lib/Makefile.orig	1	--- lib/Makefile.orig 2015-10-26 10:22:55 UTC
2	+++ lib/Makefile	2	+++ lib/Makefile
3	@@ -25,7 +25,7 @@	3	@@ -25,7 +25,7 @@
4	# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #	4	# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #
Lines 7-33 Link Here
7	-LIBRARY=libXmHTML.a	7	-LIBRARY=libXmHTML.a
8	+LIBRARY=libXmHTML.la	8	+LIBRARY=libXmHTML.la
9	SHAREDLIB=libXmHTML.so.$(ARCHIVE)	9	SHAREDLIB=libXmHTML.so.$(ARCHIVE)
10	SONAME=$(basename $(SHAREDLIB))
11		10
12	@@ -37,7 +37,7 @@	11	# Targets to make
13	SUBDIRS= common $(PLATFORM)	12	@@ -36,7 +36,7 @@ TARGET_SHARED=$(SHAREDLIB)
		13	SUBDIRS= common $(TOOLKIT)
14		14
15	# Target rules	15	# Target rules
16	-all:: $(TARGET_STATIC) $(TARGET_SHARED)	16	-all:: $(TARGET_STATIC) $(TARGET_SHARED)
17	+all:: $(TARGET_STATIC)	17	+all:: $(TARGET_STATIC)
18		18
19	# Separate rules for all targets	19	# Separate rules for all targets
20	$(PLATFORM)::	20	$(TOOLKIT)::
21	@@ -47,9 +47,9 @@	21	@@ -46,9 +46,9 @@ common::
22	@(set -x; cd common; $(MAKE) all $(pass_flags) )	22	@(set -x; cd common; $(MAKE) all $(pass_flags) )
23		23
24	$(TARGET_STATIC):: common $(PLATFORM)	24	$(TARGET_STATIC):: common $(TOOLKIT)
25	- $(RM) $@ \	25	- $(RM) $@ \
26	- $(AR) $@ common/.o $(PLATFORM)/.o	26	- $(AR) $@ common/.o $(TOOLKIT)/.o
27	- $(RANLIB) $@	27	- $(RANLIB) $@
28	+ $(RM) $@	28	+ $(RM) $@
29	+ $(LIBTOOL) --mode=link $(CC) -o $@ common/.lo $(PLATFORM)/.lo \	29	+ $(LIBTOOL) --mode=link $(CC) -o $@ common/.lo $(TOOLKIT)/.lo \
30	+ -rpath ${PREFIX}/lib -version-info 1:2	30	+ -rpath ${PREFIX}/lib -version-info 1:2
31		31
32	$(TARGET_SHARED):: common $(PLATFORM)	32	$(TARGET_SHARED):: common $(TOOLKIT)
33	$(RM) $@ ; \	33	$(RM) $@ ; \

Lines 1-6 Link Here

(-)x11-toolkits/xmhtml/files/patch-tools__Makefile (-4 / +4 lines)
1	--- tools/Makefile.orig	1	--- tools/Makefile.orig 2015-10-26 10:22:55 UTC
2	+++ tools/Makefile	2	+++ tools/Makefile
3	@@ -39,7 +39,7 @@	3	@@ -39,7 +39,7 @@ TARGETS = reptype wsize gifinfo HTMLpars
4	# rule to create .o files from .c files	4	# rule to create .o files from .c files
5	.c.o:	5	.c.o:
6	$(RM) $@	6	$(RM) $@
Lines 9-15 Link Here
9		9
10	#	10	#
11	# Special object rules	11	# Special object rules
12	@@ -50,21 +50,21 @@	12	@@ -50,21 +50,21 @@ TARGETS = reptype wsize gifinfo HTMLpars
13	#	13	#
14	gif2gzf.o: gif2gzf.c	14	gif2gzf.o: gif2gzf.c
15	$(RM) $@	15	$(RM) $@
Lines 34-40 Link Here
34		34
35	#	35	#
36	# All Targets	36	# All Targets
37	@@ -76,33 +76,33 @@	37	@@ -76,33 +76,33 @@ all: $(TARGETS)
38		38
39	reptype:: GetRepTypes.o	39	reptype:: GetRepTypes.o
40	$(RM) $@ \	40	$(RM) $@ \