|
1 # HG changeset patch |
|
2 # Parent 5c737d4329e1327fbc2aa16a5227d5ae5bc7ee03 |
|
3 |
|
4 diff -r 5c737d4329e1 Makefile |
|
5 --- a/Makefile Fri Feb 18 18:22:42 2011 +0100 |
|
6 +++ b/Makefile Fri Feb 18 21:40:42 2011 +0100 |
|
7 @@ -68,7 +68,8 @@ |
|
8 # The installation commands are kept in a separate script, which expects |
|
9 # to be run from inside the build directory. |
|
10 |
|
11 -install:; @cd build-$(buildname); \ |
|
12 +install: all |
|
13 + @cd build-$(buildname); \ |
|
14 build=$(build) $(SHELL) ../scripts/exim_install $(INSTALL_ARG) |
|
15 |
|
16 # Tidy-up targets |
|
17 diff -r 5c737d4329e1 OS/Makefile-Base |
|
18 --- a/OS/Makefile-Base Fri Feb 18 18:22:42 2011 +0100 |
|
19 +++ b/OS/Makefile-Base Fri Feb 18 21:40:42 2011 +0100 |
|
20 @@ -640,43 +640,43 @@ |
|
21 # The lookups library. |
|
22 |
|
23 buildlookups lookups/lookups.a: config.h |
|
24 - @cd lookups; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ |
|
25 + @cd lookups && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ |
|
26 CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" \ |
|
27 FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \ |
|
28 - INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) $(LOOKUP_INCLUDE)"; \ |
|
29 - echo " " |
|
30 + INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) $(LOOKUP_INCLUDE)" |
|
31 + @echo " " |
|
32 |
|
33 # The routers library. |
|
34 |
|
35 buildrouters routers/routers.a: config.h |
|
36 - @cd routers; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ |
|
37 + @cd routers && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ |
|
38 FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \ |
|
39 - INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"; \ |
|
40 - echo " " |
|
41 + INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)" |
|
42 + @echo " " |
|
43 |
|
44 # The transports library. |
|
45 |
|
46 buildtransports transports/transports.a: config.h |
|
47 - @cd transports; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ |
|
48 + @cd transports && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ |
|
49 FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \ |
|
50 - INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"; \ |
|
51 - echo " " |
|
52 + INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)" |
|
53 + @echo " " |
|
54 |
|
55 # The library of authorization modules |
|
56 |
|
57 buildauths auths/auths.a: config.h |
|
58 - @cd auths; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ |
|
59 + @cd auths && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ |
|
60 FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \ |
|
61 - INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"; \ |
|
62 - echo " " |
|
63 + INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)" |
|
64 + @echo " " |
|
65 |
|
66 # The PDKIM library |
|
67 |
|
68 buildpdkim pdkim/pdkim.a: config.h |
|
69 - @cd pdkim; $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ |
|
70 + @cd pdkim && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \ |
|
71 FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \ |
|
72 - INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"; \ |
|
73 - echo " " |
|
74 + INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)" |
|
75 + @echo " " |
|
76 |
|
77 # The "clean", "install", and "makefile" targets just pass themselves back to |
|
78 # the main Exim makefile. These targets will be obeyed only if "make" is obeyed |