[Brlcad-commits] CVS: brlcad/db Makefile.am,14.3,14.4

[Sean M. <br...@us...>]

Update of /cvsroot/brlcad/brlcad/db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15331/db

Modified Files:
	Makefile.am 
Log Message:
add a --enable-models-install option with aliases for conditionally installing the example geometry models.  benchmark geometry are still converted/installed as they are required for the installed benchmark tool

Index: Makefile.am
===================================================================
RCS file: /cvsroot/brlcad/brlcad/db/Makefile.am,v
retrieving revision 14.3
retrieving revision 14.4
diff -w -u -r14.3 -r14.4
--- Makefile.am	1 Jun 2005 19:40:06 -0000	14.3
+++ Makefile.am	3 Jun 2005 01:04:14 -0000	14.4
@@ -15,9 +15,17 @@
 		echo "$(A2G) does not exist" ; \
 	fi
 
+BENCHMARK_MODELS = \
+	bldg391.asc \
+	m35.asc \
+	moss.asc \
+	sphflake.asc \
+	star.asc \
+	world.asc
+
 MODELS = \
+	$(BENCHMARK_MODELS) \
 	axis.asc \
-	bldg391.asc \
 	boolean-ops.asc \
 	castle.asc \
 	cornell.asc \
@@ -30,18 +38,13 @@
 	kman.asc \
 	ktank.asc \
 	lgt-test.asc \
-	m35.asc \
-	moss.asc \
 	pic.asc \
 	prim.asc \
-	sphflake.asc \
-	star.asc \
 	tank_car.asc \
 	terra.asc \
 	truck.asc \
 	wave.asc \
 	woodsman.asc \
-	world.asc \
 	xmp.asc
 
 EXTRA_DIST = \
@@ -49,10 +52,19 @@
 	db.php
 
 dbdir = $(datadir)/brlcad/db
-db_DATA = ${MODELS:asc=g}
 
+if INSTALL_MODELS
+db_DATA = ${MODELS:asc=g}
 BUILT_SOURCES = ${MODELS:asc=g}
 
+else !INSTALL_MODELS
+db_DATA = ${BENCHMARK_MODELS:asc=g}
+BUILT_SOURCES = ${BENCHMARK_MODELS:asc=g}
+
+endif
+# end INSTALL_MODELS
+
+
 MOSTLYCLEANFILES = ${MODELS:asc=g}
 
 MAINTAINERCLEANFILES = Makefile.in