From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 23 Aug 2005 12:09:07 +0000 (+0000)
Subject: Allow separate build and source trees
X-Git-Tag: v1.0.10rc2~27
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=787b0469e9c90c4076f0e0fb605bc1ac5251804e;p=alsa-lib.git

Allow separate build and source trees
From: Bernard Leak <bernard@brenda-arkle.demon.co.uk>

Allow separate build and source trees.

Modified for the latest CVS tree by tiwai.
---

diff --git a/include/Makefile.am b/include/Makefile.am
index 5f3b66c8..307e7c54 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -12,10 +12,13 @@ alsainclude_HEADERS = asoundlib.h asoundef.h \
 		      alisp.h pcm_external.h pcm_ioplug.h pcm_extplug.h \
 		      control_external.h
 
-noinst_HEADERS = sys.h search.h list.h aserver.h local.h alsa-symbols.h
+noinst_HEADERS = alsa sys.h search.h list.h aserver.h local.h alsa-symbols.h
 
 CLEANFILES = stamp-vh version.h alsa
 
+alsa:
+	ln -s $(top_srcdir)/include alsa
+
 version.h: stamp-vh alsa
 	@:
 
@@ -41,11 +44,8 @@ stamp-vh: $(top_builddir)/configure.in
               echo timestamp > stamp-vh)
 	-@rm -f ver.tmp
 
-alsa:
-	ln -s . $@
-
 INCLUDES=-I$(top_srcdir)/include
 
 install-data-hook:
 	test -d $(DESTDIR)$(sysincludedir) || mkdir -p $(DESTDIR)$(sysincludedir)
-	$(INSTALL_DATA) sys.h $(DESTDIR)$(sysincludedir)/asoundlib.h
+	$(INSTALL_DATA) $(srcdir)/sys.h $(DESTDIR)$(sysincludedir)/asoundlib.h
diff --git a/modules/mixer/simple/Makefile.am b/modules/mixer/simple/Makefile.am
index 54d6bd96..82d3a887 100644
--- a/modules/mixer/simple/Makefile.am
+++ b/modules/mixer/simple/Makefile.am
@@ -2,6 +2,8 @@ pkglibdir = $(libdir)/@PACKAGE@/smixer
 
 AM_CFLAGS = -g -O2 -W -Wall
 
+INCLUDES=-I$(top_srcdir)/include
+
 pkglib_LTLIBRARIES = smixer-sbase.la \
 		     smixer-ac97.la \
 		     smixer-hda.la
diff --git a/src/Makefile.am b/src/Makefile.am
index 221639b2..5f5d76c8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ EXTRA_DIST=Versions
 COMPATNUM=@LIBTOOL_VERSION_INFO@
 
 if VERSIONED_SYMBOLS
-VSYMS = -Wl,--version-script=Versions
+VSYMS = -Wl,--version-script=$(srcdir)/Versions
 else
 VSYMS =
 endif