Fix Makefile and some unneeded #includes.

make clean would first compile everything before cleaning.
And building anything would make git-info.h too late.
This commit is contained in:
Olaf Seibert
2015-11-09 22:15:00 +01:00
parent d76e294b06
commit ecd4e81a7c
3 changed files with 6 additions and 8 deletions

View File

@@ -36,6 +36,10 @@ $(DUMPOBJ_OBJS): Makefile
git-info.h:
./make-git-info
# Bootstrap dependency on the git header file, which otherwise
# gets generated too late.
macro11.o: git-info.h
clean:
-rm -f $(MACRO11_OBJS) $(DUMPOBJ_OBJS) macro11 dumpobj
-rm -f *.d
@@ -65,7 +69,9 @@ tests: macro11 argtests
# Automatic dependency generation
ifneq ($(MAKECMDGOALS),clean)
-include $(ALL_SRCS:.c=.d)
endif
# Make .d files as side effect of compiling .c to .o
%.d %.o: %.c

View File

@@ -152,13 +152,8 @@ DAMAGE.
#include <string.h>
#include "rad50.h"
#include "stream2.h"
#include "mlb.h"
#include "macro11.h"
#include "util.h"
#define BLOCKSIZE 512

View File

@@ -45,11 +45,8 @@ DAMAGE.
#include <string.h>
#include "rad50.h"
#include "object.h"
#include "macro11.h"
/*
writerec writes "formatted binary records."
Each is preceeded by any number of 0 bytes, begins with a 1,0 pair,