Align function prototypes for libss's request handler function

[tools/e2fsprogs.git] / tests / progs / Makefile.in

diff --git a/tests/progs/Makefile.in b/tests/progs/Makefile.in
index 5ed3944..47d7adf 100644 (file)
--- a/tests/progs/Makefile.in
+++ b/tests/progs/Makefile.in
@@ -8,51 +8,77 @@ VPATH = @srcdir@
 top_builddir = ../..
 my_dir = tests/progs
 INSTALL = @INSTALL@
+MKDIR_P = @MKDIR_P@
 
 @MCONFIG@
 
-MK_CMDS=       ../../lib/ss/mk_cmds
+MK_CMDS=       _SS_DIR_OVERRIDE=$(srcdir)/../../lib/ss ../../lib/ss/mk_cmds
 
-PROGS=         test_rel
+PROGS=         test_icount crcsum
 
 TEST_REL_OBJS= test_rel.o test_rel_cmds.o
 
-SRCS=  $(srcdir)/test_rel.c 
+TEST_ICOUNT_OBJS=      test_icount.o test_icount_cmds.o
 
-LIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR)
-DEPLIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR)
+SRCS=  $(srcdir)/test_icount.c \
+       $(srcdir)/test_rel.c
+
+LIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR) $(SYSLIBS)
+DEPLIBS= $(LIBEXT2FS) $(DEPLIBSS) $(DEPLIBCOM_ERR)
 
 .c.o:
-       $(CC) -c $(ALL_CFLAGS) $< -o $@
+       $(E) "  CC $<"
+       $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
+       $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
+       $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
 
 all:: $(PROGS)
 
-test_rel: $(TEST_REL_OBJS)
-       $(LD) $(ALL_LDFLAGS) -o test_rel $(TEST_REL_OBJS) $(LIBS)
+test_rel: $(TEST_REL_OBJS) $(DEPLIBS)
+       $(E) "  LD $@"
+       $(Q) $(LD) $(ALL_LDFLAGS) -o test_rel $(TEST_REL_OBJS) $(LIBS)
+
+crcsum: crcsum.o $(DEPLIBS)
+       $(E) "  LD $@"
+       $(Q) $(LD) $(ALL_LDFLAGS) -o crcsum crcsum.o $(LIBS)
 
 test_rel_cmds.c: test_rel_cmds.ct
-       $(MK_CMDS) $(srcdir)/test_rel_cmds.ct
+       $(E) "  MK_CMDS $@"
+       $(Q) $(MK_CMDS) $(srcdir)/test_rel_cmds.ct
+
+test_icount: $(TEST_ICOUNT_OBJS) $(DEPLIBS)
+       $(E) "  LD $@"
+       $(Q) $(LD) $(ALL_LDFLAGS) -o test_icount $(TEST_ICOUNT_OBJS) $(LIBS)
 
-clean:
-       $(RM) -f $(PROGS) test_rel_cmds.c \#* *.s *.o *.a *~ core
+test_icount_cmds.c: test_icount_cmds.ct
+       $(E) "  MK_CMDS $@"
+       $(Q) $(MK_CMDS) $(srcdir)/test_icount_cmds.ct
+
+clean::
+       $(RM) -f $(PROGS) test_rel_cmds.c test_icount_cmds.c \
+               \#* *.s *.o *.a *~ core
 
 install:
 
-check:
+install-strip:
+
+uninstall:
 
 mostlyclean: clean
 distclean: clean
-       $(RM) -f .depend Makefile
+       $(RM) -f .depend Makefile $(srcdir)/TAGS $(srcdir)/Makefile.in.old
 
 # +++ Dependency line eater +++
 # 
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-test_rel.o: $(srcdir)/test_rel.c $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ss/ss.h $(top_srcdir)/lib/ss/copyright.h \
- $(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
- $(top_srcdir)/lib/ext2fs/io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+test_rel.o: $(srcdir)/test_rel.c $(top_builddir)/lib/config.h \
+ $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/ss/ss.h $(top_builddir)/lib/ss/ss_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/hashmap.h \
  $(top_srcdir)/lib/ext2fs/bitops.h $(top_srcdir)/lib/ext2fs/irel.h \
  $(top_srcdir)/lib/ext2fs/brel.h $(srcdir)/test_rel.h
-