Merge branch 'maint' into next

[flightgear.git] / utils / Makefile.am

diff --git a/utils/Makefile.am b/utils/Makefile.am
index 4393a1a97bd75cc9c29c6396a555e3b56a54aafa..5989c57f1951a27d56de00ee2847b83d424318aa 100644 (file)
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,4 +1,4 @@
-DIST_SUBDIRS = TerraSync Modeller js_server fgadmin
+DIST_SUBDIRS = GPSsmooth TerraSync Modeller js_server fgadmin xmlgrep propmerge
 
-SUBDIRS = GPSsmooth TerraSync Modeller js_server
+SUBDIRS = GPSsmooth TerraSync Modeller js_server propmerge