Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 396289 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-16 / +14 lines)
Line  Link Here
0
-- Makefile
0
++ Makefile
Lines 6-13 Link Here
6
#
6
#
7
7
8
TOP=.
8
TOP=.
9
SUBDIRS = src tests homepage examples
9
SUBDIRS = src tests examples
10
SUBDIRS += homepage/ref homepage/source
11
10
12
include $(TOP)/Makefile.config
11
include $(TOP)/Makefile.config
13
12
14
-- Makefile.config
13
++ Makefile.config
Lines 19-26 Link Here
19
EXEEXT = .exe
19
EXEEXT = .exe
20
OS = Win32
20
OS = Win32
21
else
21
else
22
CC = gcc
22
CC ?= gcc
23
LINK = gcc
23
LINK ?= gcc
24
OBJEXT = o
24
OBJEXT = o
25
EXEEXT = 
25
EXEEXT = 
26
OS = $(shell uname -s)-$(shell uname -m)
26
OS = $(shell uname -s)-$(shell uname -m)
Lines 30-36 Link Here
30
DIFF = diff -q
30
DIFF = diff -q
31
31
32
DESTDIR = 
32
DESTDIR = 
33
prefix = $(DESTDIR)/usr/local
33
prefix = $(DESTDIR)/usr
34
bindir = $(prefix)/bin
34
bindir = $(prefix)/bin
35
docdir = $(prefix)/share/doc
35
docdir = $(prefix)/share/doc
36
pkgdocdir = $(prefix)/share/doc/htp
36
pkgdocdir = $(prefix)/share/doc/htp
Lines 38-44 Link Here
38
#
38
#
39
# tool command-line options ... notice that these are geared towards GNU
39
# tool command-line options ... notice that these are geared towards GNU
40
#
40
#
41
CCOPT = -c
41
CCOPT = -c ${CFLAGS}
42
ifdef WIN32DMC
42
ifdef WIN32DMC
43
CCOPT += -o
43
CCOPT += -o
44
else
44
else
45
-- src/Makefile.sub
45
++ src/Makefile.sub
Lines 41-53 Link Here
41
41
42
src-install-bin: $(HTP)
42
src-install-bin: $(HTP)
43
	mkdir -p $(bindir)
43
	mkdir -p $(bindir)
44
	$(INSTALL) -s $(HTP) $(bindir)
44
	$(INSTALL) $(HTP) $(bindir)
45
45
46
#
46
#
47
# explicit dependency: final executable
47
# explicit dependency: final executable
48
#
48
#
49
$(HTP) : $(OBJ)
49
$(HTP) : $(OBJ)
50
	$(LINK) -o $@ $(OBJ) $(LOPT)
50
	$(LINK) $(LDFLAGS) -o $@ $(OBJ) $(LOPT)
51
51
52
#
52
#
53
# implicit dependencies for source code
53
# implicit dependencies for source code
54
-- tests/Makefile.sub
54
++ tests/Makefile.sub
Lines 23-33 Link Here
23
HTML += $(TESTS_HTML)
23
HTML += $(TESTS_HTML)
24
24
25
.PHONY: check
25
.PHONY: check
26
all: check
27
26
28
$(TESTS_HTML): $(TOP)/tests/htp.def 
27
$(TESTS_HTML): $(TOP)/tests/htp.def 
29
$(TOP)/tests/files.html: $(TOP)/tests/files.hti
28
$(TOP)/tests/files.html: $(TOP)/tests/files.hti
30
29
31
check: $(TESTS_HTML)
30
check: $(TESTS_HTML)
32
	@for i in $(TESTS_HTML); do \
31
	@for i in $(TESTS_HTML); do \
33
	$(DIFF) -bw $$i $$i.exp || echo "TEST FAILED: $$i"; done
32
		$(DIFF) -bw $$i $$i.exp || exit 1; done
34
-- examples/Makefile.sub
33
++ examples/Makefile.sub
Lines 16-19 Link Here
16
DISTFILES += $(DIR)/Makefile.sub $(EXAMPLES_SRC) $(EXAMPLES_DEF)
16
DISTFILES += $(DIR)/Makefile.sub $(EXAMPLES_SRC) $(EXAMPLES_DEF)
17
CLEAN += $(DIR)/*~ $(DIR)/htp.rsp $(DIR)/*.html $(DIR)/htpdeb.out
17
CLEAN += $(DIR)/*~ $(DIR)/htp.rsp $(DIR)/*.html $(DIR)/htpdeb.out
18
18
19
all: $(EXAMPLES_HTML)
19
examples: $(EXAMPLES_HTML)

Return to bug 396289