X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2FMakefile.in;h=9c2d39022206dc8b5756d15ffdd5656954c1c48d;hp=e592a255589a22729a330a7a40211a660757f636;hb=8b235097cbd11d728c07b966cf131aa7133ce5a9;hpb=59fa35679d83dd2e4d0cf13c2a1d2cf8fbb9de76

diff --git a/uip/Makefile.in b/uip/Makefile.in
index e592a25..9c2d390 100644
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -47,7 +47,7 @@ SETGID_MAIL    = @SETGID_MAIL@
 	$(COMPILE) $<
 
 # commands to build
-CMDS = ali anno burst comp conflict dist flist folder forw mmh mark \
+CMDS = ali anno burst comp dist flist folder forw mmh mark \
        mhbuild mhl \
        mhlist mhmail mhparam mhpath mhshow mhstore msgchk new packf pick \
        print-mimetype prompter rcvdist rcvpack rcvstore refile repl rmf \
@@ -64,7 +64,7 @@ SCMDS = inc
 
 # source files
 SRCS = ali.c aliasbr.c anno.c ap.c burst.c comp.c \
-	conflict.c dist.c distsbr.c dp.c dropsbr.c flist.c fmtdump.c \
+	dist.c distsbr.c dp.c dropsbr.c flist.c fmtdump.c \
 	folder.c forw.c inc.c mmh.sh mark.c md5.c mhbuild.c \
 	mhcachesbr.c mhfree.c mhl.c mhlist.c mhlistsbr.c \
 	mhmail.c mhmisc.c mhoutsbr.c mhparam.c mhparse.c \
@@ -102,9 +102,6 @@ burst: burst.o $(LOCALLIBS)
 comp: comp.o whatnowproc.o $(LOCALLIBS)
 	$(LINK) comp.o whatnowproc.o $(LINKLIBS)
 
-conflict: conflict.o aliasbr.o $(LOCALLIBS)
-	$(LINK) conflict.o aliasbr.o $(LINKLIBS)
-
 dist: dist.o whatnowproc.o $(LOCALLIBS)
 	$(LINK) dist.o whatnowproc.o $(LINKLIBS)