Changeset 5674:8ffa3afc2d9e in roaraudio

Timestamp:

09/23/12 15:57:07 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Install parts from build system (Closes: #325)

Files:

• ChangeLog (modified) (1 diff)
• Makefile (modified) (3 diffs)
• configure (modified) (7 diffs)
• roarclients/roar-config.c (modified) (1 diff)

ChangeLog

@@ -6 +6 @@
         * Added new configure option '--root' (Closes: #326)
         * Improved roar-config.
+        * Install parts from build system (Closes: #325)
 
 v. 1.0beta6 - Fri Sep 21 2012 18:03 CEST

Makefile

@@ -47 +47 @@
         mkdir -p '$(DESTDIR)$(PREFIX_PLUGINS)/$(DEV_VENDOR)-$(DEV_VENDOR_NAME)/universal/'
         mkdir -p '$(DESTDIR)$(PREFIX_PLUGINS)/$(DEV_VENDOR)-$(DEV_VENDOR_NAME)/roard/$(DEV_VENDOR)-$(DEV_VENDOR_NAME)'
+        mkdir -p '$(DESTDIR)$(PREFIX_BUILDSYSTEM)'
         set -e; cd doc; $(MAKE) prep-install-dirs; cd ..
 
@@ -60 +61 @@
         set -e; cd doc; $(MAKE) install; cd ..
         set -e; for i in $(PLUGINS); do if [ "$$i" != '' ]; then cd $$i; $(MAKE) install; cd ../..; fi; done
+        cp $(cp_v) build-system/*.*     '$(DESTDIR)$(PREFIX_BUILDSYSTEM)'
 
 semi-install: prep-install
@@ -72 +74 @@
         set -e; cd doc; $(MAKE) semi-install; cd ..
         set -e; for i in $(PLUGINS); do if [ "$$i" != '' ]; then cd $$i; $(MAKE) semi-install; cd ../..; fi; done
+        ln -fs `pwd`/build-system/*.* '$(DESTDIR)$(PREFIX_BUILDSYSTEM)'

configure

@@ -25 +25 @@
 PREFIX_COMP_BINS=''
 PREFIX_PLUGINS=''
+PREFIX_BUILDSYSTEM=''
 
 CDROM_IS_DEV=true
@@ -157 +158 @@
    echo '--prefix-comp-bins DIR      - Set prefix for compatibility binaries  (default: $PREFIX_LIB/roaraudio/compbins)'
    echo '--prefix-plugins DIR        - Set prefix for plugin search path (default: $PREFIX_LIB/roaraudio/plugins)'
+   echo '--prefix-buildsystem DIR    - Set prefix for plugin search path (default: $PREFIX_LIB/roaraudio/build-system)'
    echo
    echo '--default-rate RATE         - Set default sample rate for roard and roarclients'
@@ -418 +420 @@
    shift;
   ;;
+  '--prefix-buildsystem')
+   PREFIX_BUILDSYSTEM="$2"
+   shift;
+  ;;
 ####################################
 # autof* options block:
@@ -428 +434 @@
   '--prefix-plugins='*)
    PREFIX_PLUGINS=$(echo "$1" | cut -d= -f2)
+  ;;
+  '--prefix-buildsystem='*)
+   PREFIX_BUILDSYSTEM=$(echo "$1" | cut -d= -f2)
   ;;
 ####################################
@@ -503 +512 @@
 
 update_prefixes
-[ "$PREFIX_COMP_LIBS" = '' ] && PREFIX_COMP_LIBS="$PREFIX_LIB/roaraudio/complibs/"
-[ "$PREFIX_COMP_BINS" = '' ] && PREFIX_COMP_BINS="$PREFIX_LIB/roaraudio/compbins/"
-[ "$PREFIX_PLUGINS"   = '' ] && PREFIX_PLUGINS="$PREFIX_LIB/roaraudio/plugins/"
+[ "$PREFIX_COMP_LIBS"   = '' ] && PREFIX_COMP_LIBS="$PREFIX_LIB/roaraudio/complibs/"
+[ "$PREFIX_COMP_BINS"   = '' ] && PREFIX_COMP_BINS="$PREFIX_LIB/roaraudio/compbins/"
+[ "$PREFIX_PLUGINS"     = '' ] && PREFIX_PLUGINS="$PREFIX_LIB/roaraudio/plugins/"
+[ "$PREFIX_BUILDSYSTEM" = '' ] && PREFIX_BUILDSYSTEM="$PREFIX_LIB/roaraudio/build-system/"
 
 [ "$DEFAULT_GRP" = '' ] && DEFAULT_GRP='audio'
@@ -526 +536 @@
  echo "PREFIX_COMP_BINS=$PREFIX_COMP_BINS"
  echo "PREFIX_PLUGINS=$PREFIX_PLUGINS"
+ echo "PREFIX_BUILDSYSTEM=$PREFIX_BUILDSYSTEM"
  echo
  $COMP_LIBS      && echo "comp_libs=libroar libroardsp libroarmidi libroarlight libroareio"
@@ -566 +577 @@
  echo "#define ROAR_PREFIX_COMP_BINS \"$PREFIX_COMP_BINS\""
  echo "#define ROAR_PREFIX_PLUGINS \"$PREFIX_PLUGINS\""
+ echo "#define ROAR_PREFIX_BUILDSYSTEM \"$PREFIX_BUILDSYSTEM\""
  echo
  $MINIMAL      && echo '#define ROAR_MINIMAL'

roarclients/roar-config.c

@@ -66 +66 @@
  {"prefix-comp-bins", ROAR_PREFIX_COMP_BINS},
  {"prefix-plugins", ROAR_PREFIX_PLUGINS},
+ {"prefix-buildsystem", ROAR_PREFIX_BUILDSYSTEM},
  {"<<<END>>>", NULL}
 };