]>
Commit | Line | Data |
---|---|---|
ec06c5af AM |
1 | diff -urN exim-4.52.org/OS/Makefile-Base exim-4.52/OS/Makefile-Base |
2 | --- exim-4.52.org/OS/Makefile-Base 2005-07-01 13:09:15.000000000 +0200 | |
3 | +++ exim-4.52/OS/Makefile-Base 2005-07-01 20:03:16.409615448 +0200 | |
4 | @@ -96,14 +96,14 @@ | |
5 | # therefore always be run, even if the files exist. This shouldn't in fact be a | |
6 | # problem, but it does no harm. Other make programs will just ignore this. | |
7 | ||
8 | -.PHONY: all allexim buildauths buildlookups buildpcre buildrouters \ | |
9 | +.PHONY: all allexim buildauths buildlookups buildrouters \ | |
10 | buildtransports checklocalmake clean | |
11 | ||
12 | ||
a59efb33 AM |
13 | # This is the real default target for all the various exim binaries and |
14 | # scripts, once the configuring stuff is done. | |
15 | ||
16 | -allexim: config.h buildpcre $(EXIM_MONITOR) exicyclog exinext exiwhat \ | |
17 | +allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \ | |
d8109ca8 | 18 | exigrep eximstats exipick exiqgrep exiqsumm \ |
a59efb33 AM |
19 | transport-filter.pl convert4r3 convert4r4 \ |
20 | exim_checkaccess \ | |
ec06c5af AM |
21 | @@ -314,7 +314,7 @@ |
22 | local_scan.o $(EXIM_PERL) $(OBJ_WITH_CONTENT_SCAN) \ | |
23 | $(OBJ_WITH_OLD_DEMIME) $(OBJ_EXPERIMENTAL) | |
a59efb33 AM |
24 | |
25 | -exim: pcre/libpcre.a lookups/lookups.a auths/auths.a \ | |
26 | +exim: lookups/lookups.a auths/auths.a \ | |
27 | routers/routers.a transports/transports.a \ | |
28 | $(OBJ_EXIM) version.c | |
29 | @echo " " | |
ec06c5af AM |
30 | @@ -325,7 +325,7 @@ |
31 | rm -f exim | |
32 | @echo "$(LNCC) -o exim" | |
33 | $(FE)$(PURIFY) $(LNCC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \ | |
a59efb33 AM |
34 | - pcre/libpcre.a \ |
35 | + -lpcre \ | |
36 | routers/routers.a transports/transports.a lookups/lookups.a \ | |
37 | auths/auths.a \ | |
38 | $(LIBRESOLV) $(LIBS) $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) \ | |
ec06c5af | 39 | @@ -429,14 +429,14 @@ |
a59efb33 | 40 | |
ec06c5af | 41 | OBJ_MONBIN = util-spool_in.o util-store.o util-string.o tod.o tree.o $(MONBIN) |
a59efb33 AM |
42 | |
43 | -eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) pcre/libpcre.a \ | |
44 | +eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) \ | |
45 | ../exim_monitor/em_version.c | |
ec06c5af AM |
46 | @echo "$(CC) exim_monitor/em_version.c" |
47 | $(FE)$(CC) -o em_version.o -c \ | |
a59efb33 | 48 | $(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c |
ec06c5af AM |
49 | @echo "$(LNCC) -o eximon.bin" |
50 | $(FE)$(PURIFY) $(LNCC) -o eximon.bin em_version.o $(LFLAGS) $(XLFLAGS) \ | |
a59efb33 AM |
51 | - $(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 pcre/libpcre.a \ |
52 | + $(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 -lpcre \ | |
53 | $(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc | |
54 | @if [ x"$(STRIP_COMMAND)" != x"" ]; then \ | |
55 | echo $(STRIP_COMMAND) eximon.bin; \ |