1) all main()s should return ints

2) use new dependency scheme

CVS patchset: 2025
CVS date: 1998/03/04 16:53:24

diff --git a/tools/Makefile.in b/tools/Makefile.in
index dd5bfba..e8225ac 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,5 +1,6 @@
 srcdir = @srcdir@
 VPATH = $(srcdir)
+top_srcdir = @top_srcdir@
 
 include ../Makefile.inc
 
@@ -20,10 +21,12 @@ clean:
        rm -f *.a *.o core *~ $(PROGS)
 
 distclean: clean
-       rm -f .depend Makefile
+       rm -f Makefile
 
 depend:
-       $(CPP) $(CFLAGS) -M $(srcdir)/*.c > .depend
+       topdir_path=`( cd $(top_srcdir) && pwd )` ; \
+           $(CPP) $(CFLAGS) -MM $(srcdir)/*.c | \
+               sed s+$$topdir_path+$(top_srcdir)+g > .depend
 
 $(PROGS): ../lib/librpm.a
 

diff --git a/tools/dump.c b/tools/dump.c
index 08319b5..a6e7580 100644 (file)
--- a/tools/dump.c
+++ b/tools/dump.c
@@ -8,7 +8,7 @@
 #include "rpmlib.h"
 #include "intl.h"
 
-void main(int argc, char ** argv)
+int main(int argc, char ** argv)
 {
     Header h;
     int fd;
@@ -33,6 +33,8 @@ void main(int argc, char ** argv)
   
     headerDump(h, stdout, 1, rpmTagTable);
     headerFree(h);
+
+    return 0;
 }
 
   

diff --git a/tools/dumpdb.c b/tools/dumpdb.c
index 3e9f21a..70db0f5 100644 (file)
--- a/tools/dumpdb.c
+++ b/tools/dumpdb.c
@@ -9,7 +9,7 @@
 #include "rpmlib.h"
 #include "intl.h"
 
-void main(int argc, char ** argv)
+int main(int argc, char ** argv)
 {
     Header h;
     int offset;
@@ -53,6 +53,8 @@ void main(int argc, char ** argv)
     }
 
     rpmdbClose(db);
+
+    return 0;
 }