Project

General

Profile

improve-makefiles.patch

Vladimir Timofeev, January 28, 2012 18:32

View differences:

buildsys.mk.in
21 21
#  POSSIBILITY OF SUCH DAMAGE.
22 22
#
23 23

  
24
abs_top_srcdir = @abs_top_srcdir@
25

  
24 26
PACKAGE = @PACKAGE@
25 27
AS = @AS@
26 28
CC = @CC@
......
37 39
ASFLAGS = @ASFLAGS@
38 40
CFLAGS = @CFLAGS@
39 41
CXXFLAGS = @CXXFLAGS@
40
CPPFLAGS = @CPPFLAGS@
42
CPPFLAGS = -I. -I$(abs_top_srcdir) -I$(abs_top_srcdir)/src @CPPFLAGS@
41 43
DFLAGS = @DFLAGS@
42 44
ERLCFLAGS = @ERLCFLAGS@
43 45
OBJCFLAGS = @OBJCFLAGS@
src/audacious/Makefile
108 108
		${PTHREAD_CFLAGS}		\
109 109
		-D_AUDACIOUS_CORE		\
110 110
		${EGGSM_CFLAGS}			\
111
		${LIBGUESS_CFLAGS}		\
112
		-I.. -I../..
111
		${LIBGUESS_CFLAGS}
113 112

  
114 113
# Essential for efficient FFTs. --jlindgren
115 114
CFLAGS += -ffast-math
src/audtool/Makefile
11 11
include ../../buildsys.mk
12 12
include ../../extra.mk
13 13

  
14
CPPFLAGS += -I.. -I../.. \
15
            ${AUDACIOUS_DEFINES} \
14
CPPFLAGS += ${AUDACIOUS_DEFINES} \
16 15
            ${DBUS_CFLAGS} \
17 16
            ${GTK_CFLAGS}
18 17

  
src/libaudclient/Makefile
12 12
pre-depend:
13 13
	cd ../audacious; ${MAKE} ${MFLAGS} dbus-client-bindings.h
14 14

  
15
CPPFLAGS = ${CFLAGS} -D_AUDACIOUS_CORE -I.. -I../..
15
CPPFLAGS += ${CFLAGS} -D_AUDACIOUS_CORE
16 16
CFLAGS += ${LIB_CFLAGS}		\
17 17
	  ${GLIB_CFLAGS}	\
18 18
	  ${DBUS_CFLAGS}
src/libaudcore/Makefile
29 29

  
30 30
includesubdir = libaudcore
31 31

  
32
CPPFLAGS += -DHAVE_CONFIG_H ${PTHREAD_CFLAGS} ${GLIB_CFLAGS} -I.. -I../..
32
CPPFLAGS += -DHAVE_CONFIG_H ${PTHREAD_CFLAGS} ${GLIB_CFLAGS}
33 33
CFLAGS += ${LIB_CFLAGS}
34 34

  
35 35
LIBS += ${PTHREAD_LIBS} ${GLIB_LIBS} -lm
src/libaudgui/Makefile
32 32

  
33 33
includesubdir = libaudgui
34 34

  
35
CPPFLAGS += -DHAVE_CONFIG_H -I.. -I../.. ${GLIB_CFLASG} ${GTK_CFLAGS} ${DBUS_CFLAGS} ${AUDACIOUS_DEFINES} ${REGEX_CFLAGS}
35
CPPFLAGS += -DHAVE_CONFIG_H ${GLIB_CFLASG} ${GTK_CFLAGS} ${DBUS_CFLAGS} ${AUDACIOUS_DEFINES} ${REGEX_CFLAGS}
36 36
CFLAGS += ${LIB_CFLAGS}
37 37
LIBS += -lm ${GLIB_LIBS} ${GTK_LIBS} ${REGEX_LIBS} -L../libaudcore -laudcore
src/libaudtag/Makefile
16 16
include ../../buildsys.mk
17 17
include ../../extra.mk
18 18

  
19
CPPFLAGS += ${GLIB_CFLAGS} -D_AUDACIOUS_CORE -I.. -I../..
19
CPPFLAGS += ${GLIB_CFLAGS} -D_AUDACIOUS_CORE
20 20
CFLAGS += ${LIB_CFLAGS}
21 21
LIBS += ${GLIB_LIBS} -L../libaudcore -laudcore
src/libeggsmclient/Makefile
5 5
include ../../buildsys.mk
6 6
include ../../extra.mk
7 7

  
8
CPPFLAGS += ${GLIB_CFLAGS} ${GTK_CFLAGS} ${SM_CFLAGS} -I../.. -DEGG_SM_CLIENT_BACKEND_XSMP
8
CPPFLAGS += ${GLIB_CFLAGS} ${GTK_CFLAGS} ${SM_CFLAGS} -DEGG_SM_CLIENT_BACKEND_XSMP
9 9
LIBS += ${GLIB_LIBS} ${GTK_LIBS} ${SM_LIBS}