Removed hard-coded -I.. and -I../.. from INCLUDES.

[mmh] / uip / Makefile.in

diff --git a/uip/Makefile.in b/uip/Makefile.in
index a5ecae8..1f5a495 100644 (file)
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -17,7 +17,7 @@ etcdir      = @sysconfdir@
 CC       = @CC@
 CFLAGS   = @CFLAGS@
 DEFS     = @DEFS@
-INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@
+INCLUDES = -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@
 LDFLAGS  = @LDFLAGS@
 
 LIBS     = @LIBS@
@@ -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,12 +63,12 @@ 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 \
-       mhpath.c mhshow.c mhshowsbr.c mhstore.c mhstoresbr.c mhtest.c \
+       mhpath.c mhshow.c mhshowsbr.c mhstore.c mhtest.c \
        msgchk.c new.c packf.c pick.c print-mimetype.sh \
        prompter.c rcvdist.c rcvpack.c rcvstore.c \
        refile.c repl.c rmf.c rmm.c scan.c scansbr.c send.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)
 
@@ -120,14 +117,14 @@ fmtdump: fmtdump.o $(LOCALLIBS)
 folder: folder.o $(LOCALLIBS)
        $(LINK) folder.o $(LINKLIBS)
 
-forw: forw.o whatnowproc.o annosbr.o $(LOCALLIBS)
-       $(LINK) forw.o whatnowproc.o annosbr.o $(LINKLIBS)
+forw: forw.o whatnowproc.o $(LOCALLIBS)
+       $(LINK) forw.o whatnowproc.o $(LINKLIBS)
 
 inc: inc.o scansbr.o termsbr.o $(LOCALLIBS)
        $(LINK) inc.o scansbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
 
 mmh: mmh.sh
-       cp mmh.sh mmh
+       cp $(srcdir)/mmh.sh mmh
        chmod +x mmh
 
 mark: mark.o $(LOCALLIBS)
@@ -154,8 +151,8 @@ mhpath: mhpath.o $(LOCALLIBS)
 mhshow: mhshow.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhmisc.o mhfree.o termsbr.o md5.o $(LOCALLIBS)
        $(LINK) mhshow.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhmisc.o mhfree.o termsbr.o md5.o $(LINKLIBS) $(TERMLIB)
 
-mhstore: mhstore.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhstoresbr.o mhmisc.o mhfree.o termsbr.o md5.o $(LOCALLIBS)
-       $(LINK) mhstore.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhstoresbr.o mhmisc.o mhfree.o termsbr.o md5.o $(LINKLIBS) $(TERMLIB)
+mhstore: mhstore.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhmisc.o mhfree.o termsbr.o md5.o $(LOCALLIBS)
+       $(LINK) mhstore.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhmisc.o mhfree.o termsbr.o md5.o $(LINKLIBS) $(TERMLIB)
 
 mhtest: mhtest.o mhparse.o mhcachesbr.o mhoutsbr.o mhmisc.o mhfree.o termsbr.o md5.o $(LOCALLIBS)
        $(LINK) mhtest.o mhparse.o mhcachesbr.o mhoutsbr.o mhmisc.o mhfree.o termsbr.o md5.o $(LINKLIBS) $(TERMLIB)
@@ -173,7 +170,7 @@ pick: pick.o $(LOCALLIBS)
        $(LINK) pick.o $(LINKLIBS)
 
 print-mimetype: print-mimetype.sh
-       cp print-mimetype.sh print-mimetype
+       cp $(srcdir)/print-mimetype.sh print-mimetype
        chmod +x print-mimetype
 
 prompter: prompter.o $(LOCALLIBS)
@@ -191,8 +188,8 @@ rcvstore: rcvstore.o $(LOCALLIBS)
 refile: refile.o $(LOCALLIBS)
        $(LINK) refile.o $(LINKLIBS)
 
-repl: repl.o whatnowproc.o annosbr.o $(LOCALLIBS)
-       $(LINK) repl.o whatnowproc.o annosbr.o $(LINKLIBS)
+repl: repl.o whatnowproc.o $(LOCALLIBS)
+       $(LINK) repl.o whatnowproc.o $(LINKLIBS)
 
 rmf: rmf.o $(LOCALLIBS)
        $(LINK) rmf.o $(LINKLIBS)
@@ -207,7 +204,7 @@ send: send.o distsbr.o $(LOCALLIBS)
        $(LINK) send.o distsbr.o $(LINKLIBS)
 
 sendfiles: sendfiles.sh
-       cp sendfiles.sh sendfiles
+       cp $(srcdir)/sendfiles.sh sendfiles
        chmod +x sendfiles
 
 show: show.o $(LOCALLIBS)
@@ -222,8 +219,8 @@ sortm: sortm.o $(LOCALLIBS)
 spost: spost.o aliasbr.o $(LOCALLIBS)
        $(LINK) spost.o aliasbr.o $(LINKLIBS)
 
-whatnow: whatnow.o annosbr.o $(LOCALLIBS)
-       $(LINK) whatnow.o annosbr.o $(LINKLIBS)
+whatnow: whatnow.o $(LOCALLIBS)
+       $(LINK) whatnow.o $(LINKLIBS)
 
 # ========== DEPENDENCIES FOR INSTALLING ==========