diff options
| author | josh.macdonald <jmacd@users.noreply.github.com> | 2013-01-20 03:09:40 +0000 |
|---|---|---|
| committer | josh.macdonald <jmacd@users.noreply.github.com> | 2013-01-20 03:09:40 +0000 |
| commit | 90e1af8f3e1867c33f86fe9ceccbaada01e8caef (patch) | |
| tree | ece8b943a9ede6a48f6a349274e6938050595320 | |
| parent | 972579fd3cb277b2b480902cb830076f6ea6d816 (diff) | |
Makefile fix
| -rw-r--r-- | xdelta3/Makefile.am | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/xdelta3/Makefile.am b/xdelta3/Makefile.am index e152b39..2b35e65 100644 --- a/xdelta3/Makefile.am +++ b/xdelta3/Makefile.am | |||
| @@ -36,8 +36,11 @@ xdelta3regtest_SOURCES = $(common_SOURCES) \ | |||
| 36 | testing/test.h | 36 | testing/test.h |
| 37 | 37 | ||
| 38 | WFLAGS = -Wall -Wshadow -fno-builtin -Wextra -Wsign-compare \ | 38 | WFLAGS = -Wall -Wshadow -fno-builtin -Wextra -Wsign-compare \ |
| 39 | -Wextra -Wno-unused-parameter \ | 39 | -Wextra -Wno-unused-parameter |
| 40 | -pedantic -std=c99 | 40 | |
| 41 | C_WFLAGS = $(WFLAGS) -pedantic -std=c99 | ||
| 42 | CXX_WFLAGS = $(WFLAGS) -pedantic | ||
| 43 | |||
| 41 | common_CFLAGS = \ | 44 | common_CFLAGS = \ |
| 42 | -DGENERIC_ENCODE_TABLES=0 \ | 45 | -DGENERIC_ENCODE_TABLES=0 \ |
| 43 | -DREGRESSION_TEST=1 \ | 46 | -DREGRESSION_TEST=1 \ |
| @@ -51,11 +54,11 @@ if DEBUG_SYMBOLS | |||
| 51 | common_CFLAGS += -g | 54 | common_CFLAGS += -g |
| 52 | endif | 55 | endif |
| 53 | 56 | ||
| 54 | xdelta3_CFLAGS = $(WFLAGS) $(common_CFLAGS) -DXD3_DEBUG=1 | 57 | xdelta3_CFLAGS = $(C_WFLAGS) $(common_CFLAGS) -DXD3_DEBUG=1 |
| 55 | xdelta3_LDADD = -lm | 58 | xdelta3_LDADD = -lm |
| 56 | 59 | ||
| 57 | xdelta3decode_CFLAGS = \ | 60 | xdelta3decode_CFLAGS = \ |
| 58 | $(WFLAGS) \ | 61 | $(C_WFLAGS) \ |
| 59 | -DGENERIC_ENCODE_TABLES=0 \ | 62 | -DGENERIC_ENCODE_TABLES=0 \ |
| 60 | -DREGRESSION_TEST=0 \ | 63 | -DREGRESSION_TEST=0 \ |
| 61 | -DSECONDARY_DJW=0 \ | 64 | -DSECONDARY_DJW=0 \ |
| @@ -68,8 +71,10 @@ xdelta3decode_CFLAGS = \ | |||
| 68 | -DEXTERNAL_COMPRESSION=0 \ | 71 | -DEXTERNAL_COMPRESSION=0 \ |
| 69 | -DVCDIFF_TOOLS=0 | 72 | -DVCDIFF_TOOLS=0 |
| 70 | 73 | ||
| 71 | xdelta3regtest_CXXFLAGS = $(WFLAGS) $(common_CFLAGS) -DNOT_MAIN=1 -DXD3_DEBUG=1 | 74 | xdelta3regtest_CXXFLAGS = \ |
| 72 | xdelta3regtest_CFLAGS = $(WFLAGS) $(common_CFLAGS) -DNOT_MAIN=1 -DXD3_DEBUG=1 | 75 | $(CXX_WFLAGS) $(common_CFLAGS) -DNOT_MAIN=1 -DXD3_DEBUG=1 |
| 76 | xdelta3regtest_CFLAGS = \ | ||
| 77 | $(C_WFLAGS) $(common_CFLAGS) -DNOT_MAIN=1 -DXD3_DEBUG=1 | ||
| 73 | xdelta3regtest_LDADD = -lm | 78 | xdelta3regtest_LDADD = -lm |
| 74 | 79 | ||
| 75 | man1_MANS = xdelta3.1 | 80 | man1_MANS = xdelta3.1 |