]>
Commit | Line | Data |
---|---|---|
6fe61c5e | 1 | --- di-4.18/Makefile~ 2009-11-30 01:50:38.000000000 +0000 |
2 | +++ di-4.18/Makefile 2009-11-30 15:11:51.460747491 +0000 | |
3 | @@ -67,7 +67,7 @@ | |
79ecae25 | 4 | |
5 | # have to get various environment variables set up. | |
6 | all: | |
7 | - ./Build | |
8 | + ./Build -mkc | |
9 | ||
10 | di-all: config.h $(PROG)$(EXE_EXT) hasnls$(EXE_EXT) | |
11 | ||
6fe61c5e | 12 | @@ -84,15 +84,14 @@ |
79ecae25 | 13 | CC=cl LD=cl EXE_EXT=".exe" OBJ_EXT=".obj" \ |
14 | CFLAGS="$(CFLAGS) -nologo -O2 \ | |
15 | -DDEFAULT_FORMAT=\\\"sMbuvpT\\\"" \ | |
16 | - LDFLAGS="-nologo -O2" $(PROG).exe | |
17 | + LDFLAGS="-nologo" $(PROG).exe | |
18 | ||
19 | # This was tested using cygwin | |
20 | windows-gcc: wconfig.h | |
21 | $(MAKE) -f Makefile \ | |
22 | CC=gcc LD=gcc EXE_EXT=".exe" OBJ_EXT=".o" \ | |
23 | CFLAGS="$(CFLAGS) -g -O2 \ | |
24 | - -DDEFAULT_FORMAT=\\\"sMbuvpT\\\"" \ | |
25 | - LDFLAGS="-g -O2" $(PROG).exe | |
26 | + -DDEFAULT_FORMAT=\\\"sMbuvpT\\\"" | |
27 | ||
28 | #################### | |
29 | ||
6fe61c5e | 30 | @@ -191,7 +190,7 @@ |
31 | realloc$(OBJ_EXT) trimchar$(OBJ_EXT) getopt$(OBJ_EXT) | |
79ecae25 | 32 | @test ! -f reqlibs.txt || echo "*** Using libs: `cat reqlibs.txt`" |
33 | $(CC) -o $(PROG)$(EXE_EXT) \ | |
34 | - $(CFLAGS) $(LDFLAGS) \ | |
35 | + $(CFLAGS) $(OPTFLAGS) $(LDFLAGS) \ | |
6fe61c5e | 36 | di$(OBJ_EXT) didiskutil$(OBJ_EXT) digetinfo$(OBJ_EXT) \ |
37 | digetentries$(OBJ_EXT) \ | |
38 | realloc$(OBJ_EXT) trimchar$(OBJ_EXT) \ | |
39 | @@ -200,7 +199,7 @@ | |
79ecae25 | 40 | |
41 | hasnls$(EXE_EXT): hasnls$(OBJ_EXT) | |
42 | $(CC) -o hasnls$(EXE_EXT) \ | |
43 | - $(CFLAGS) $(LDFLAGS) \ | |
44 | + $(CFLAGS) $(OPTFLAGS) $(LDFLAGS) \ | |
45 | hasnls$(OBJ_EXT) | |
46 | ||
47 | ### |