rework handling of srcdir != builddir (patch from Flameeyes)

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1366 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/Makefile.am b/src/Makefile.am
index 22e0a5c9a20fcc7c7c4b1bd070ee736a0ab4fc27..3dec5c1c666e8372118ab324b985257bad715f3e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,7 +42,7 @@ endif
 #     Compiler/linker flags       #
 ###################################
 
-AM_CFLAGS = -I$(top_srcdir)/src
+AM_CFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src/modules -I$(top_builddir)/src/modules/rtp -I$(top_builddir)/src/modules/gconf
 AM_CFLAGS += $(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS
 AM_CFLAGS += $(LTDLINCL)
 AM_CFLAGS += $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS)
@@ -995,12 +995,8 @@ SYMDEF_FILES = \
 EXTRA_DIST += $(SYMDEF_FILES)
 BUILT_SOURCES += $(SYMDEF_FILES)
 
-modulesdirs: 
-       $(mkdir_p) modules
-       $(mkdir_p) modules/gconf
-       $(mkdir_p) modules/rtp
-
-$(SYMDEF_FILES): modules/module-defs.h.m4 modulesdirs
+$(SYMDEF_FILES): modules/module-defs.h.m4
+       $(mkdir_p) modules/gconf modules/rtp
        $(M4) -Dfname="$@" $< > $@
 
 # Simple protocol