Fix uip/whom.c for C89 compatibility

[mmh] / uip / Makefile.in

diff --git a/uip/Makefile.in b/uip/Makefile.in
index 8fe7197..e7e7b46 100644 (file)
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -8,6 +8,8 @@ top_srcdir = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
+VERSION = `$(top_srcdir)/version.sh $(top_srcdir)`
+
 prefix      = @prefix@
 exec_prefix = @exec_prefix@
 bindir      = @bindir@
@@ -22,7 +24,7 @@ INCLUDES = -I$(srcdir) -I$(top_srcdir) -I.. @CPPFLAGS@
 LDFLAGS  = @LDFLAGS@
 
 LIBS     = @LIBS@
-LOCALLIBS = ../config/version.o ../config/config.o ../sbr/libmh.a
+LOCALLIBS = ../sbr/libmh.a
 LINKLIBS = $(LOCALLIBS) $(LIBS)
 
 LINT    = @LINT@
@@ -31,7 +33,7 @@ LINTFLAGS = @LINTFLAGS@
 TERMLIB = @TERMLIB@
 LEXLIB  = @LEXLIB@
 
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
+COMPILE = $(CC) -c $(DEFS) -DVERSION="\"$(VERSION)\"" $(INCLUDES) $(CFLAGS)
 LINK    = $(CC) $(LDFLAGS) -o $@
 LN = ln
 
@@ -58,7 +60,7 @@ CMDS = ali anno burst comp dist flist folder forw mmh mark \
 LCMDS = flists folders next prev fnext fprev unseen
 
 # misc support binaries
-MISC = ap dp fmtdump mhtest mmhwrap
+MISC = ap dp fmtdump mhtest mmhwrap whatnow2
 
 # commands with 'S'pecial installation needs
 SCMDS = inc
@@ -74,13 +76,7 @@ SRCS = ali.c aliasbr.c anno.c ap.c burst.c comp.c \
        prompter.c rcvdist.c rcvpack.c rcvstore.c \
        refile.c repl.c rmf.c rmm.c scan.c scansbr.c send.c \
        sendfiles.sh slocal.c sortm.c spost.c termsbr.c \
-       whatnow.c whatnowproc.c whom.c
-
-# auxiliary files
-AUX = Makefile.in
-
-# all files in this directory included in the distribution
-DIST = $(SRCS) $(AUX)
+       whatnow.c whatnowproc.c whom.c whatnow2.sh
 
 # ========== DEFAULT TARGET ==========
 
@@ -136,7 +132,7 @@ mmhwrap: mmhwrap.sh
        chmod +x mmhwrap
 
 mhsign: mhsign.sh
-       cp $(srcdir)/mhsign.sh mhsign
+       sed "s,%libdir%,"$(libdir)"," $(srcdir)/mhsign.sh >mhsign
        chmod +x mhsign
 
 mhpgp: mhpgp.sh
@@ -229,6 +225,9 @@ spost: spost.o aliasbr.o $(LOCALLIBS)
 whatnow: whatnow.o $(LOCALLIBS)
        $(LINK) whatnow.o $(LINKLIBS)
 
+whatnow2: whatnow2.sh
+       cp $(srcdir)/whatnow2.sh whatnow2
+
 whom: whom.o $(LOCALLIBS)
        $(LINK) whom.o $(LINKLIBS)
 
@@ -317,10 +316,3 @@ subdir = uip
 Makefile: Makefile.in ../config.status
        cd .. && ./config.status $(subdir)/$@
 
-distdir = ../`cat ../distname`/$(subdir)
-mmhdist: $(DIST)
-       @echo "Copying distribution files in $(subdir)"
-       @for file in $(DIST); do \
-         cp -p $(srcdir)/$$file $(distdir); \
-       done
-