ericonr/sndio
1
0
Fork 0
mirror of https://github.com/ericonr/sndio.git synced 2024-02-18 04:45:21 -06:00
Code Issues Projects Releases Wiki Activity

unbreak xvolkeys conditional compilation

Browse Source
This commit is contained in:
Alexandre Ratchov 2014-03-10 15:33:26 +01:00
parent 4709dcb282
commit 5fb297f312
2 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Makefile.in
View File

@ -1,25 +1,33 @@
SUBDIRS = @subdirs@ XVOLKEYS = @xvolkeys@
all: all:
for i in ${SUBDIRS}; do (cd $$i && ${MAKE}); done @cd libsndio && ${MAKE}
@cd sndiod && ${MAKE}
@cd sndioctl && ${MAKE}
@cd aucat && ${MAKE}
@if test ${XVOLKEYS} = yes; then cd xvolkeys && ${MAKE}; fi
install: install:
for i in ${SUBDIRS}; do (cd $$i && ${MAKE} install); done @cd libsndio && ${MAKE} install
@cd sndiod && ${MAKE} install
@cd sndioctl && ${MAKE} install
@cd aucat && ${MAKE} install
@if test ${XVOLKEYS} = yes; then cd xvolkeys && ${MAKE} install; fi
uninstall: uninstall:
cd aucat && ${MAKE} uninstall @cd xvolkeys && ${MAKE} uninstall
cd sndioctl && ${MAKE} uninstall @cd aucat && ${MAKE} uninstall
cd sndiod && ${MAKE} uninstall @cd sndioctl && ${MAKE} uninstall
cd libsndio && ${MAKE} uninstall @cd sndiod && ${MAKE} uninstall
cd xvolkeys && ${MAKE} uninstall @cd libsndio && ${MAKE} uninstall
clean: clean:
cd aucat && ${MAKE} clean @cd aucat && ${MAKE} clean
cd sndioctl && ${MAKE} clean @cd sndioctl && ${MAKE} clean
cd sndiod && ${MAKE} clean @cd sndiod && ${MAKE} clean
cd libsndio && ${MAKE} clean @cd libsndio && ${MAKE} clean
cd examples && ${MAKE} clean @cd examples && ${MAKE} clean
cd xvolkeys && ${MAKE} clean @cd xvolkeys && ${MAKE} clean
distclean: clean distclean: clean
rm -f \ rm -f \

14
configure vendored
View File

@ -45,11 +45,6 @@ unset libdir # path where to install library
unset defs # no extra #defines unset defs # no extra #defines
unset ldadd # no extra libraries (-l options) unset ldadd # no extra libraries (-l options)
#
# components to build
#
subdirs="libsndio sndioctl sndiod aucat"
# #
# guess OS-specific parameters # guess OS-specific parameters
# #
@ -173,13 +168,6 @@ if [ $rmidi = yes ]; then
defs="$defs -DUSE_RMIDI" defs="$defs -DUSE_RMIDI"
fi fi
#
# include xvolkeys to the build
#
if [ $xvolkeys = yes ]; then
subdirs="$subdirs xvolkeys"
fi
for f in Makefile aucat/Makefile sndiod/Makefile \ for f in Makefile aucat/Makefile sndiod/Makefile \
libsndio/Makefile sndioctl/Makefile xvolkeys/Makefile \ libsndio/Makefile sndioctl/Makefile xvolkeys/Makefile \
examples/Makefile \ examples/Makefile \
@ -197,7 +185,7 @@ do
-e "s:@vars@:${vars}:" \ -e "s:@vars@:${vars}:" \
-e "s:@precision@:$precision:" \ -e "s:@precision@:$precision:" \
-e "s:@user@:$user:" \ -e "s:@user@:$user:" \
-e "s:@subdirs@:$subdirs:" \ -e "s:@xvolkeys@:$xvolkeys:" \
< $f.in > $f < $f.in > $f
done done