diff -urN exim-3.15.orig/OS/Makefile-Base exim-3.15/OS/Makefile-Base --- exim-3.15.orig/OS/Makefile-Base Wed Jun 14 09:57:38 2000 +++ exim-3.15/OS/Makefile-Base Sat Jul 22 12:35:24 2000 @@ -79,7 +79,7 @@ # This is the real default target for all the various exim binaries and # scripts, once the configuring stuff is done. -allexim: config.h buildpcre $(EXIM_MONITOR) exicyclog exinext exiwhat \ +allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \ ../util/exigrep ../util/eximstats ../util/exiqsumm \ ../util/transport-filter.pl ../util/convert4r3 \ exim_dbmbuild exim_dumpdb exim_fixdb exim_tidydb exim_lock \ @@ -203,7 +203,7 @@ route.o search.o smtp_in.o smtp_out.o spool_in.o spool_out.o \ store.o string.o tod.o transport.o tree.o verify.o $(EXIM_PERL) -exim: libident/libident.a pcre/libpcre.a lookups/lookups.a auths/auths.a \ +exim: libident/libident.a lookups/lookups.a auths/auths.a \ directors/directors.a routers/routers.a transports/transports.a \ $(OBJ_EXIM) version.c awk '{ print ($$1+1) }' cnumber.h > cnumber.temp @@ -211,7 +211,7 @@ $(CC) -c $(CFLAGS) $(INCLUDE) $(IPV6_INCLUDE) version.c /bin/rm -f exim $(PURIFY) $(CC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \ - libident/libident.a pcre/libpcre.a directors/directors.a \ + libident/libident.a -lpcre directors/directors.a \ routers/routers.a transports/transports.a lookups/lookups.a \ auths/auths.a \ $(LIBS) $(IPV6_LIBS) $(EXTRALIBS) $(DBMLIB) $(LIBRESOLV) \ @@ -283,12 +283,12 @@ OBJ_MONBIN = dummies.o os.o spool_in.o store.o string.o tree.o $(MONBIN) -eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) pcre/libpcre.a \ +eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) \ ../exim_monitor/em_version.c $(CC) -o em_version.o -c \ $(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c $(PURIFY) $(CC) -o eximon.bin em_version.o $(LFLAGS) $(XLFLAGS) \ - $(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 pcre/libpcre.a \ + $(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 -lpcre \ $(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc @echo " " @echo ">>> exim monitor binary built"