Skip to content

Commit bd17f75

Browse files
committed
Makefile changes
1 parent 619d5b7 commit bd17f75

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

src/Makefile.gcc.win

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,16 @@ SRC = mqsmf.c \
3939
HDR = mqsmfstruc.h \
4040
mqsmf.h
4141

42-
checkSize: mqsmfcsv.exe
42+
default: mqsmfcsv.exe
43+
44+
all: sizeTest shipTest
45+
46+
sizeTest: mqsmfcsv.exe
4347
./mqsmfcsv.exe -v > sizes.tmp
4448
diff -b sizes.tmp sizes.master
4549

50+
shipTest: mqsmfcsv.exe
51+
cd ../testing/shipTest;./shipTest.sh
4652

4753
mqsmfcsv.exe: $(SRC) $(HDR) Makefile.gcc.win dummy
4854
-rm -f $@
@@ -57,5 +63,4 @@ convH.exe: convH.c
5763
$(CC) $(CFLAGS) -o $@ convH.c
5864
cp $@ ../bin/win
5965

60-
6166
dummy:

src/Makefile.unix

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,18 @@ SRC = \
3939
HDR = mqsmfstruc.h \
4040
mqsmf.h
4141

42-
checkSize: mqsmfcsv
42+
default: mqsmfcsv
43+
44+
all: sizeTest shipTest
45+
tests: all
46+
47+
sizeTest: mqsmfcsv
4348
./mqsmfcsv -v > sizes.tmp
4449
diff -b sizes.tmp sizes.master
4550

51+
shipTest: mqsmfcsv
52+
cd ../testing/shipTest;./shipTest.sh
53+
4654
mqsmfcsv: $(SRC) $(HDR) Makefile.unix dummy
4755
$(CC) $(PLATFLAGS) -o $@ $(SRC) $(CFLAGS) -DCSQDSMF_VERSION=$(VERS)
4856

src/checkSize.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "stdio.h"
22
#include "stddef.h"
3-
#include "../src/mqsmfstruc.h"
3+
#include "mqsmfstruc.h"
44

55
void checkStructureSizes(FILE *fp) {
66

0 commit comments

Comments
 (0)