Makefile - Issue 6812006: Enable -Wall -Werror and fix 2 compile-errors it would introduce.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: Makefile

Issue 6812006: Enable -Wall -Werror and fix 2 compile-errors it would introduce. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/speech_synthesis.git@master

Patch Set: Created 9 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.	1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4	4

5 CXX ?= g++	5 CXX ?= g++

6	6

7 LDFLAGS = -lpthread -lm -lasound -lpico -lresample -lchromeos -lrt -lbase	7 LDFLAGS = -lpthread -lm -lasound -lpico -lresample -lchromeos -lrt -lbase

8	8

9 CCFLAGS = $(CFLAGS) \	9 CCFLAGS = $(CFLAGS) \

	10 -Wall -Werror \

10 -I. \	11 -I. \

11 -I/build/x86_generic/usr/include \	12 -I/build/x86_generic/usr/include \

12 -L/build/x86_generic/usr/lib	13 -L/build/x86_generic/usr/lib

13	14

14 INCLUDE_DIRS=-I -I.. $(shell pkg-config --cflags gobject-2.0 dbus-1 dbus-glib-1)	15 INCLUDE_DIRS=-I -I.. $(shell pkg-config --cflags gobject-2.0 dbus-1 dbus-glib-1)

15 LIB_DIRS=-L $(shell pkg-config --libs gobject-2.0 dbus-1 dbus-glib-1)	16 LIB_DIRS=-L $(shell pkg-config --libs gobject-2.0 dbus-1 dbus-glib-1)

16	17

17 DBUS_SOURCE=speech_synthesizer.xml	18 DBUS_SOURCE=speech_synthesizer.xml

18 DBUS_SERVER=bindings/server.h	19 DBUS_SERVER=bindings/server.h

19 DBUS_CLIENT=bindings/client.h	20 DBUS_CLIENT=bindings/client.h

(...skipping 80 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
100 $(CXX) $(CCFLAGS) -c tts_chromeos.cc	101 $(CXX) $(CCFLAGS) -c tts_chromeos.cc

101	102

102 tts_chromeos: tts_loader.o tts_chromeos.o	103 tts_chromeos: tts_loader.o tts_chromeos.o

103 $(CXX) \	104 $(CXX) \

104 $(CCFLAGS) $(INCLUDE_DIRS) $(LIB_DIRS) \	105 $(CCFLAGS) $(INCLUDE_DIRS) $(LIB_DIRS) \

105 -o tts_chromeos \	106 -o tts_chromeos \

106 tts_loader.o tts_chromeos.o \	107 tts_loader.o tts_chromeos.o \

107 $(LDFLAGS) -ldl	108 $(LDFLAGS) -ldl

108	109

109	110

OLD	NEW

« no previous file with comments | « no previous file | earcon_manager.cc » ('j') | no next file with comments »