Merge branch 'curt/make' into next

Makefile.am

@@ -8,8 +8,6 @@ SUBDIRS = \
 EXTRA_DIST = \
 	acinclude.m4 \
 	autogen.sh \
-	FlightGear.dsp \
-	FlightGear.dsw \
 	projects \
 	README \
 	README.OpenAL \
@@ -19,7 +17,6 @@ EXTRA_DIST = \
 	Thanks
 
 dist-hook:
-	(cd $(top_srcdir); $(HOME)/Projects/FlightGear/admin/am2dsp.pl)
 	(cd $(top_srcdir); tar --exclude docs-mini/CVS --exclude hints/CVS \
 		-cf - docs-mini ) | (cd $(distdir); tar xvf -)
 	rm -rf `find $(distdir)/projects -name CVS`

utils/Makefile.am

@@ -1,4 +1,4 @@
-DIST_SUBDIRS = GPSsmooth TerraSync Modeller js_server fgadmin xmlgrep propmerge
+DIST_SUBDIRS = GPSsmooth TerraSync Modeller js_server fgadmin xmlgrep propmerge fgviewer
 
 SUBDIRS = GPSsmooth TerraSync Modeller js_server propmerge fgviewer