56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
Upstream-Status: Inappropriate [configuration]
|
|
|
|
Index: git/Makefile
|
|
===================================================================
|
|
--- git.orig/Makefile 2010-11-22 11:20:14.303472770 -0600
|
|
+++ git/Makefile 2010-11-22 14:11:19.152635423 -0600
|
|
@@ -1,5 +1,3 @@
|
|
-CC = gcc
|
|
-CFLAGS = -Wall -O2 -g -W
|
|
ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
|
|
PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon
|
|
LIBS = -lpthread
|
|
@@ -11,13 +9,13 @@
|
|
all: $(ALL)
|
|
|
|
btt/btt:
|
|
- $(MAKE) -C btt
|
|
+ CC="${CC}" CFLAGS="${CFLAGS}" $(MAKE) -C btt CC="${CC}" CFLAGS="${CFLAGS}"
|
|
|
|
btreplay/btrecord:
|
|
- $(MAKE) -C btreplay
|
|
+ CC="${CC}" CFLAGS="${CFLAGS}" $(MAKE) -C btreplay CC="${CC}" CFLAGS="${CFLAGS}" btrecord
|
|
|
|
btreplay/btreplay:
|
|
- $(MAKE) -C btreplay
|
|
+ CC="${CC}" CFLAGS="${CFLAGS}" $(MAKE) -C btreplay CC="${CC}" CFLAGS="${CFLAGS}" btreplay
|
|
|
|
%.o: %.c
|
|
$(CC) -o $*.o -c $(ALL_CFLAGS) $<
|
|
Index: git/btreplay/Makefile
|
|
===================================================================
|
|
--- git.orig/btreplay/Makefile 2010-11-22 11:21:12.972679035 -0600
|
|
+++ git/btreplay/Makefile 2010-11-22 14:07:01.492839945 -0600
|
|
@@ -5,8 +5,6 @@
|
|
# NDEBUG - Defined: no asserts, Undefined: asserts
|
|
#
|
|
|
|
-CC = gcc
|
|
-CFLAGS = -Wall -W -O2 -g
|
|
INCS = -I. -I.. -I../btt
|
|
OCFLAGS = -UCOUNT_IOS -UDEBUG -DNDEBUG
|
|
XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
|
|
Index: git/btt/Makefile
|
|
===================================================================
|
|
--- git.orig/btt/Makefile 2010-11-22 11:21:01.833758370 -0600
|
|
+++ git/btt/Makefile 2010-11-22 14:07:15.783258253 -0600
|
|
@@ -5,8 +5,6 @@
|
|
# NDEBUG - Defined: no asserts, Undefined: asserts
|
|
#
|
|
|
|
-CC = gcc
|
|
-CFLAGS = -Wall -W -O2 -g
|
|
INCS = -I. -I..
|
|
XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
|
|
override CFLAGS += $(INCS) $(XCFLAGS)
|