summaryrefslogtreecommitdiff
path: root/x11-toolkits/xmhtml/files/patch-Makefile
blob: 759cfb729d34336df00e37012a9877c84e376aa9 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
--- 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
 
 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       =
-IMAGEINCLUDES = $(ZLIBINC)
+IMAGEINCLUDES = `libpng-config --cflags` -I${LOCALBASE}/include $(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).
 #
-CPPFLAGS = -D_GNU_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -DHAVE_REGEX_H \
+CPPFLAGS = -DHAVE_REGEX_H \
 	$(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
-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.