diff options
Diffstat (limited to '')
| -rw-r--r-- | flx/Makefile | 5 | ||||
| -rw-r--r-- | flx/arg.c | 1 | ||||
| -rw-r--r-- | flx/check.c | 2 | ||||
| -rw-r--r-- | flx/flx.h | 2 | ||||
| -rw-r--r-- | ifenslave/Makefile | 5 |
5 files changed, 10 insertions, 5 deletions
diff --git a/flx/Makefile b/flx/Makefile index 37e878b..a84b701 100644 --- a/flx/Makefile +++ b/flx/Makefile @@ -26,13 +26,12 @@ NAME=flx -VERSION=0.6.6d -COPYRIGHT="Copyright 2002, Benoit DOLEZ <bdolez@ant-computing.com>" +VERSION=0.6.6e SRC=main.c arg.c utils.c md5.c flx.c fct1.c check.c sign.c \ input.c input_fs.c input_file.c \ output.c output_file.c OBJ=$(SRC:.c=.o) -CFLAGS= -Wall -O2 -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\" -DCOPYRIGHT=\"$(COPYRIGHT)\" +CFLAGS= -Wall -O2 -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\" LDFLAGS=-L. $(NAME): $(OBJ) @@ -2,6 +2,7 @@ #include <string.h> #include <stdarg.h> +#include "flx.h" #include "arg.h" diff --git a/flx/check.c b/flx/check.c index cbc8639..4c09a47 100644 --- a/flx/check.c +++ b/flx/check.c @@ -473,7 +473,7 @@ int flxcheck_main(int argc, char **argv) { /* on compare les données deux à deux afin de compléter 'dst' */ ft_find_diff(&src1, &src2, &dst); ft_find_diff(&src1, &tmp2, &dst); - ft_find_diff(&src2, &tmp1, &dst); + ft_find_diff(&tmp1, &src2, &dst); /* toutes les données identiques ont été détectée pour la partie * déterminée, on déplace le contenu de la source vers les tampons */ @@ -8,6 +8,8 @@ #include "utils.h" #include "md5.h" +#define COPYRIGHT "Copyright 2002, Benoit DOLEZ <bdolez@ant-computing.com>" + #define DUMPBASENAME "formilux-sig.dat" #define MD5_Init(ctx) ToolsMD5Init(ctx) diff --git a/ifenslave/Makefile b/ifenslave/Makefile index 3a7ec80..e90f13f 100644 --- a/ifenslave/Makefile +++ b/ifenslave/Makefile @@ -1,10 +1,13 @@ OBJS=ifenslave -include ../../include/rules.make +# include ../../include/rules.make CC=gcc CFLAGS+=-Wstrict-prototypes -I/usr/src/linux/include -momit-leaf-frame-pointer all: $(OBJS) +clean: + rm -vf $(OBJS) core *.[oa] *~ + ifenslave: ifenslave.o $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< strip -R .comment -R .note $@ |