Improve Linux install/remove scripts.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1615 0c269be4-1314-0410-8aa9-9f06e86f4224

ChangeLog

@@ -15,7 +15,7 @@ Tom Szilagyi
 
 2007-10-16 Stephane Letz  <letz@grame.fr>
 
-	* Reorganize jack hearders. 
+	* Reorganize jack headers. Improve Linux install/remove scripts.
 
 2007-10-16 Stephane Letz  <letz@grame.fr>
 

linux/Makefile

@@ -3,7 +3,7 @@
 prefix := /usr/local
 prefix := ${DESTDIR}${prefix}
 
-subprojects := ../common ../tests ../example-clients alsa freebob
+subprojects := ../common ../common/jack ../tests ../example-clients alsa freebob
 
 sources := $(wildcard *.cpp) $(wildcard */*.cpp) $(wildcard ../common/*.cpp) $(wildcard ../tests/*.cpp)
 
@@ -121,7 +121,7 @@ install:
 	cp jack_dummy.so $(prefix)/lib/jackmp
 	[ -f jack_freebob.so ]  && cp jack_freebob.so $(prefix)/lib/jackmp || echo "freebob driver not installed"
 	cd $(prefix)/lib && [ -f libjack.so.0.0.23 ] && mv -f libjack.so.0.0.23 tmp_libjack.so.0.0.23 || echo "Jack not found, continue..."
-	cd $(prefix)/bin && [ -f jackd ]  && mv -f jackd tmp_jackd 
+	cd $(prefix)/bin && [ -f jackd ]  && mv -f jackd tmp_jackd || echo "jackd server not found" 
 	cd $(prefix)/lib && rm -f libjack.so*
 	cd $(prefix)/lib && ln -s libjackmp.so  libjack.so
 	cd $(prefix)/lib && ln -s libjackmp.so  libjack.so.0
@@ -138,15 +138,14 @@ remove:
 	rm -r $(prefix)/lib/jackmp
 	cd $(prefix)/lib && rm -f libjack.so*
 	cd $(prefix)/lib && [ -f tmp_libjack.so.0.0.23 ] && mv -f tmp_libjack.so.0.0.23 libjack.so.0.0.23 \
-	&& ln -s libjack.so.0.0.23  libjack.so && ln -s libjack.so.0.0.23  libjack.so.0 || echo "Jack not restored"
-	cd $(prefix)/bin && [ -f tmp_jackd ] && mv -f tmp_jackd jackd
+	&& ln -s libjack.so.0.0.23  libjack.so && ln -s libjack.so.0.0.23  libjack.so.0 || echo "libjack not restored"
+	cd $(prefix)/bin && [ -f tmp_jackd ] && mv -f tmp_jackd jackd || echo "jackd server not restored"
 	/sbin/ldconfig
 
 clean :
 	rm -f *.o
 	rm -f $(TARGET_LINUX_SERVER)  $(TARGET_LINUX_SERVER_LIB) $(TARGET_LINUX_CLIENT_LIB) $(TARGET_LINUX_WRAPPER_LIB) $(TARGET_LINUX_ALSA) $(TARGET_LINUX_FREEBOB) $(TARGET_LINUX_DUMMY) \
-		synchroClient synchroServer synchroServerClient testSem jack_test
-		
+	synchroClient synchroServer synchroServerClient testSem jack_test jack_load jack_unload inprocess.so	
 depend :
 	#makedepend -w120 -Y -- $(CXXFLAGS) -- $(sources)