libvamp: Fix all target to not build disabled targets.
The all target should not try to build targets that are disabled by configure. Otherwise make will try to build the programs (even if you disabled them) and fail if libsndfile was not found. We will need a working all target when we want to use automake for Audacity.
This commit is contained in:
parent
da736f9f44
commit
c2a15f6df6
|
@ -127,6 +127,7 @@ libvamp
|
|||
Library to load and use VAMP plug-ins. http://www.vamp-plugins.org/
|
||||
Version in Audacity SVN: 2.5
|
||||
Patches: fix-linkage-against-dl.patch: Fix linkage against dl for hostsdk library.
|
||||
fix-all-target.patch: Fix all target to not build disabled targets.
|
||||
Upstream Version: 2.5
|
||||
|
||||
libvorbis
|
||||
|
|
|
@ -34,7 +34,7 @@ RDFGENDIR = rdf/generator
|
|||
# clean -- remove binary targets
|
||||
# distclean -- remove all targets
|
||||
#
|
||||
default: @TARGETS@
|
||||
all: @TARGETS@
|
||||
|
||||
# Compile flags
|
||||
#
|
||||
|
@ -231,8 +231,6 @@ host: $(HOST_TARGET)
|
|||
|
||||
rdfgen: $(RDFGEN_TARGET)
|
||||
|
||||
all: sdk plugins host rdfgen test
|
||||
|
||||
$(SDK_STATIC): $(SDK_OBJECTS) $(API_HEADERS) $(SDK_HEADERS)
|
||||
$(AR) r $@ $(SDK_OBJECTS)
|
||||
|
||||
|
|
|
@ -0,0 +1,27 @@
|
|||
Description: Fix all target to not build disabled targets.
|
||||
The all target should not try to build targets that are disabled by configure.
|
||||
Otherwise make will try to build the programs (even if you disabled them) and
|
||||
fail if libsndfile was not found.
|
||||
|
||||
Index: Makefile.in
|
||||
===================================================================
|
||||
--- Makefile.in (revision 12950)
|
||||
+++ Makefile.in (working copy)
|
||||
@@ -34,7 +34,7 @@
|
||||
# clean -- remove binary targets
|
||||
# distclean -- remove all targets
|
||||
#
|
||||
-default: @TARGETS@
|
||||
+all: @TARGETS@
|
||||
|
||||
# Compile flags
|
||||
#
|
||||
@@ -231,8 +231,6 @@
|
||||
|
||||
rdfgen: $(RDFGEN_TARGET)
|
||||
|
||||
-all: sdk plugins host rdfgen test
|
||||
-
|
||||
$(SDK_STATIC): $(SDK_OBJECTS) $(API_HEADERS) $(SDK_HEADERS)
|
||||
$(AR) r $@ $(SDK_OBJECTS)
|
||||
|
Loading…
Reference in New Issue