Merge lp:~gaul/percona-data-recovery-tool-for-innodb/makefile-consistency into lp:percona-data-recovery-tool-for-innodb

Proposed by Andrew Gaul
Status: Merged
Merged at revision: 55
Proposed branch: lp:~gaul/percona-data-recovery-tool-for-innodb/makefile-consistency
Merge into: lp:percona-data-recovery-tool-for-innodb
Diff against target: 25 lines (+3/-3)
1 file modified
Makefile (+3/-3)
To merge this branch: bzr merge lp:~gaul/percona-data-recovery-tool-for-innodb/makefile-consistency
Reviewer Review Type Date Requested Status
Percona developers Pending
Review via email: mp+117511@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2012-01-11 16:09:14 +0000
3+++ Makefile 2012-07-31 18:54:18 +0000
4@@ -30,10 +30,10 @@
5 gcc $(CFLAGS) -g $(INCLUDES) -o constraints_parser constraints_parser.c lib/tables_dict.o lib/print_data.o lib/check_data.o lib/libut.a lib/libmystrings.a
6
7 innochecksum: innochecksum.c include/innochecksum.h
8- gcc $(INCLUDES) -o $@ $<
9+ gcc $(CFLAGS) $(INCLUDES) -o $@ $<
10
11 ibdconnect: ibdconnect.c include/ibdconnect.h include/sys_defs.h
12- gcc -o $@ $<
13+ gcc $(CFLAGS) $(INCLUDES) -o $@ $<
14
15 dict_parsers: all
16 @mkdir -p bin
17@@ -77,7 +77,7 @@
18 rm -rf innodb_recovery
19
20 clean:
21- rm -f page_parser constraints_parser innochecksum
22+ rm -f page_parser constraints_parser innochecksum ibdconnect
23 rm -rf lib constraints_parser.dSYM page_parser.dSYM
24
25 distclean: clean

Subscribers

People subscribed via source and target branches