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

diff --git a/uip/Makefile.in b/uip/Makefile.in
index 7d4f422..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 \
@@ -63,8 +63,8 @@ MISC = ap dp fmtdump mhtest
 SCMDS = inc
 
 # source files
-SRCS = ali.c aliasbr.c anno.c annosbr.c ap.c burst.c comp.c \
-	conflict.c dist.c distsbr.c dp.c dropsbr.c flist.c fmtdump.c \
+SRCS = ali.c aliasbr.c anno.c ap.c burst.c comp.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 \
@@ -93,8 +93,8 @@ ali: ali.o aliasbr.o $(LOCALLIBS)
 ap: ap.o $(LOCALLIBS)
 	$(LINK) ap.o $(LINKLIBS)
 
-anno: anno.o annosbr.o $(LOCALLIBS)
-	$(LINK) anno.o annosbr.o $(LINKLIBS)
+anno: anno.o $(LOCALLIBS)
+	$(LINK) anno.o $(LINKLIBS)
 
 burst: burst.o $(LOCALLIBS)
 	$(LINK) burst.o $(LINKLIBS)
@@ -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)