diff -u -r1.12 -r1.13
--- Makefile.in	28 Feb 2007 22:58:04 -0000	1.12
+++ Makefile.in	29 Jun 2011 22:14:37 -0000	1.13
@@ -1,42 +1,35 @@

-# $Header: /cvs/lcd/SimDist/Makefile.in,v 1.12 2007/02/28 22:58:04 jeremy Exp $

+# $Header: /cvs/lcd/SimDist/Makefile.in,v 1.13 2011/06/29 22:14:37 jeremy Exp $

-# include the common build vars
-include $(CURDIR)/build/common.gmk

+#
+# Top-level Makefile for SimDist distribution.
+#

-# force these targets to execute without dep checking
-.PHONY: build package_versions distclean package_distclean baseclean tgz tgz_upload tgz_upload_current

+# Include the common build vars generated by Autoconf.
+include $(CURDIR)/build/common.gmk

-# default to building all the packages, testing, and installing
-.DEFAULT: build

+# Default to building all the packages, testing, and installing.
+default_targets := build

-# Target to build a single package.  Additional arguments should be valid generic 
-# targets from package.gmk or a custom target defined in that package's Makefile.
-ifdef PACKAGE
-.DEFAULT: single_package
-single_package:
-	@echo $(filter-out $(firstword $@),$@);
-	cd packages/$(PACKAGE) && $(MAKE) $(filter-out $(firstword $@),$@);
-endif    

+# Add lib install if building shared libs.
+ifdef SIMDIST_BUILD_SHARED
+default_targets += install_shared_libs
+endif
+
+# Set the default Make rule.
+.DEFAULT: $(default_targets)
+
+# Force these targets to execute without dep checking.
+no_dep_targets := build package_versions distclean package_distclean baseclean
+.PHONY: $(no_dep_targets)

-# build the packages and test slic

+# Build the packages and test slic.

 build: build_packages test
 

-# build the packages

+# Build the packages.

 build_packages:
 	@cd packages && make;:
 

-# remake the versions list
-package_versions:
-	@cd $(sim_build_dir) && for p in $$(ls ../packages/*/VERSION); do cat $$p; done &> package_versions.txt ;:
-
-# completely clean the packages and the base area
-distclean: package_distclean baseclean config
-
-# rerun configure
-config:
-	./configure
-
-# remove configure-generated files from each package

+# Remove configure-generated files from each package.

 package_distclean:
 	@for dir in $(packages_reverse_dep_order); do \
 	echo "Cleaning package $$dir ..." ; \

@@ -47,26 +40,12 @@

 baseclean:
 	@cd $(sim_dist_dir) && rm -rf GNUmakefile common/common.gmk;:
 

-# Make a versioned tarball of the entire SimDist.
-dist_tgz_simdist:
-	@echo "Making versioned distribution tarball $(dist_tarball) ... " ; \
-	cd ..; rm -rf $(dist_tarball) &> /dev/null; \
-	tar zcf $(dist_tarball) $(sim_dist_dir_basename) ;:
-
-# Local copy the versioned SimDist tarball to one labelled as "current".
-dist_tgz_simdist_current: dist_tgz_simdist
-	@echo "Making current distribution tarball $(dist_tarball_current) ... " ; \
-	cp ../$(dist_tarball) ../$(dist_tarball_current) ;:
-
-# Upload a versioned SimDist tgz to the distribution directory.
-dist_scp_simdist: dist_tgz_simdist
-	@echo "Uploading versioned distribution tarball $(dist_tarball) to $(dist_dir) ... " ; \
-	$(SCP) ../$(dist_tarball) $(dist_dir);:

+# Completely clean the packages and the base area.
+distclean: package_distclean baseclean

-# Upload a current SimDist tgz to the distribution directory.
-dist_scp_simdist_current: dist_tgz_simdist_current
-	@echo "Uploading current distribution tarball $(dist_tarball_current) to $(dist_dir) ... " ; \
-	$(SCP) ../$(dist_tarball_current) $(dist_dir);:

+# Remake the versions list.
+package_versions:
+	@cd $(sim_build_dir) && for p in $$(ls ../packages/*/VERSION); do cat $$p; done &> package_versions.txt ;:

 
 # test for and run slic binary
 test:

@@ -77,10 +56,44 @@

 	echo "check FAILED: $(slic_bin) does not exist." ; \
 	fi;:
 

+# Install shared libraries to single directory.
+install_shared_libs:
+	@mkdir -p ./lib; ./scripts/install-libs.sh
+
+# Crap to remove...
+# Target to build a single package.  
+# Additional arguments should be valid generic targets from package.gmk,
+# or a custom target defined in that package's Makefile.
+#ifdef PACKAGE
+#.DEFAULT: single_package
+#single_package:
+#	@echo $(filter-out $(firstword $@),$@);
+#	cd packages/$(PACKAGE) && $(MAKE) $(filter-out $(firstword $@),$@);
+#endif    
+#

 # install target that just puts the run script someplace

-install:
-	@mkdir $(prefix)/bin && cp $(sim_scripts_dir)/$(slic_run_script) $(prefix)/bin
-

+#install:
+#	@mkdir $(prefix)/bin && cp $(sim_scripts_dir)/$(slic_run_script) $(prefix)/bin

 # tag the current SimDist release in cvs (only works for those with SLAC CVS account)

-rtag:
-	$(CVS) rtag $$(date +v%Y-%m-%d) SimDist

+#rtag:
+#	$(CVS) rtag $$(date +v%Y-%m-%d) SimDist
+# Rerun configure.
+#config:
+#	./configure
+# Make a versioned tarball of the entire SimDist.
+#dist_tgz_simdist:
+#	@echo "Making versioned distribution tarball $(dist_tarball) ... " ; \
+#	cd ..; rm -rf $(dist_tarball) &> /dev/null; \
+#	tar zcf $(dist_tarball) $(sim_dist_dir_basename) ;:
+# Local copy the versioned SimDist tarball to one labelled as "current".
+#dist_tgz_simdist_current: dist_tgz_simdist
+#	@echo "Making current distribution tarball $(dist_tarball_current) ... " ; \
+#	cp ../$(dist_tarball) ../$(dist_tarball_current) ;:
+# Upload a versioned SimDist tgz to the distribution directory.
+#dist_scp_simdist: dist_tgz_simdist
+#	@echo "Uploading versioned distribution tarball $(dist_tarball) to $(dist_dir) ... " ; \
+#	$(SCP) ../$(dist_tarball) $(dist_dir);:
+# Upload a current SimDist tgz to the distribution directory.
+#dist_scp_simdist_current: dist_tgz_simdist_current
+#	@echo "Uploading current distribution tarball $(dist_tarball_current) to $(dist_dir) ... " ; \
+#	$(SCP) ../$(dist_tarball_current) $(dist_dir);: