reorder setting of AM_CFLAGS a bit

This commit is contained in:
Lennart Poettering 2008-10-21 22:05:13 +02:00
parent c4b346259f
commit 1cd25f1485

View file

@ -45,26 +45,27 @@ endif
# Compiler/linker flags # # Compiler/linker flags #
################################### ###################################
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src/modules -I$(top_builddir)/src/modules/rtp -I$(top_builddir)/src/modules/gconf -I$(top_builddir)/src/modules/bluetooth AM_CFLAGS = \
AM_CFLAGS += $(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS -I$(top_srcdir)/src \
AM_CFLAGS += $(LTDLINCL) -I$(top_builddir)/src/modules \
AM_CFLAGS += $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS) $(LIBSPEEX_CFLAGS) -I$(top_builddir)/src/modules/rtp \
AM_CFLAGS += -DPA_DLSEARCHPATH=\"$(modlibexecdir)\" -I$(top_builddir)/src/modules/gconf \
AM_CFLAGS += -DPA_DEFAULT_CONFIG_DIR=\"$(PA_DEFAULT_CONFIG_DIR)\" -I$(top_builddir)/src/modules/bluetooth \
AM_CFLAGS += -DPA_BINARY=\"$(PA_BINARY)\" -I$(top_builddir)/src/modules/raop \
AM_CFLAGS += -DPA_SYSTEM_RUNTIME_PATH=\"$(PA_SYSTEM_RUNTIME_PATH)\" $(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS \
AM_CFLAGS += -DPA_SYSTEM_CONFIG_PATH=\"$(PA_SYSTEM_CONFIG_PATH)\" $(LTDLINCL) \
AM_CFLAGS += -DPA_SYSTEM_STATE_PATH=\"$(PA_SYSTEM_STATE_PATH)\" $(LIBSAMPLERATE_CFLAGS) \
AM_CFLAGS += -DAO_REQUIRE_CAS $(LIBSNDFILE_CFLAGS) \
AM_CFLAGS += -DPULSE_LOCALEDIR=\"$(pulselocaledir)\" $(LIBSPEEX_CFLAGS) \
AM_CFLAGS += -DPA_MACHINE_ID=\"$(localstatedir)/lib/dbus/machine-id\" -DPA_DLSEARCHPATH=\"$(modlibexecdir)\" \
-DPA_DEFAULT_CONFIG_DIR=\"$(PA_DEFAULT_CONFIG_DIR)\" \
# This cool debug trap works on i386/gcc only -DPA_BINARY=\"$(PA_BINARY)\" \
AM_CFLAGS += '-DDEBUG_TRAP=__asm__("int $$3")' -DPA_SYSTEM_RUNTIME_PATH=\"$(PA_SYSTEM_RUNTIME_PATH)\" \
-DPA_SYSTEM_CONFIG_PATH=\"$(PA_SYSTEM_CONFIG_PATH)\" \
if HAVE_OPENSSL -DPA_SYSTEM_STATE_PATH=\"$(PA_SYSTEM_STATE_PATH)\" \
AM_CFLAGS += -I$(top_builddir)/src/modules/raop -DAO_REQUIRE_CAS \
endif -DPULSE_LOCALEDIR=\"$(pulselocaledir)\" \
-DPA_MACHINE_ID=\"$(localstatedir)/lib/dbus/machine-id\"
AM_LIBADD = $(PTHREAD_LIBS) $(INTLLIBS) AM_LIBADD = $(PTHREAD_LIBS) $(INTLLIBS)
AM_LDADD = $(PTHREAD_LIBS) $(INTLLIBS) AM_LDADD = $(PTHREAD_LIBS) $(INTLLIBS)