diff options
author | Lennart Poettering <lennart@poettering.net> | 2006-09-02 14:59:12 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2006-09-02 14:59:12 +0000 |
commit | 2536ba9279f681eb97ba51bdc3b5cadad7c5c5fc (patch) | |
tree | 736f223cef6ca11201328438294a2ddf4150e533 /src/Makefile.am | |
parent | e504e807ce43df0a7bc0bad1158e06aca31368c3 (diff) |
rework handling of srcdir != builddir (patch from Flameeyes)
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1366 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 22e0a5c9..3dec5c1c 100644 --- 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 |