Remove Output lib and put the functionality into genapts, the only place where it is needed

src/Airports/GenAirports850/CMakeLists.txt

@@ -7,7 +7,7 @@ add_executable(genapts850
     beznode.hxx
     closedpoly.hxx closedpoly.cxx
     debug.hxx debug.cxx
-    elevations.cxx elevations.hxx 
+    elevations.cxx elevations.hxx
     global.hxx
     helipad.hxx helipad.cxx
     lights.cxx
@@ -15,6 +15,7 @@ add_executable(genapts850
     linked_objects.hxx linked_objects.cxx
     main.cxx
     object.hxx object.cxx
+    output.hxx output.cxx
     parser.hxx parser.cxx
     runway.cxx runway.hxx
     rwy_simple.cxx
@@ -25,10 +26,10 @@ add_executable(genapts850
 
 target_link_libraries(genapts850
     Polygon Geometry
-    Array Output
+    Array
     ${GDAL_LIBRARY}
     ${SIMGEAR_CORE_LIBRARIES}
     ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
     ${RT_LIBRARY})
 
-install(TARGETS genapts850 RUNTIME DESTINATION bin)
+install(TARGETS genapts850 RUNTIME DESTINATION bin)

src/Airports/GenAirports850/airport.cxx

@@ -17,15 +17,15 @@
 #include <Polygon/tg_unique_vec3f.hxx>
 #include <Polygon/tg_unique_vec2f.hxx>
 
-#include <Output/output.hxx>
-
-#include "beznode.hxx"
-#include "runway.hxx"
-#include "helipad.hxx"
 #include "airport.hxx"
-#include "global.hxx"
-#include "elevations.hxx"
+#include "beznode.hxx"
 #include "debug.hxx"
+#include "elevations.hxx"
+#include "global.hxx"
+#include "helipad.hxx"
+#include "runway.hxx"
+#include "output.hxx"
+
 
 Airport::Airport( int c, char* def)
 {

src/Airports/GenAirports850/output.hxx

@@ -20,8 +20,8 @@
 //
 
 
-#ifndef _TG_OUTPUT_HXX
-#define _TG_OUTPUT_HXX
+#ifndef _OUTPUT_HXX
+#define _OUTPUT_HXX
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

src/Lib/CMakeLists.txt

@@ -4,6 +4,5 @@ add_subdirectory(Array)
 add_subdirectory(DEM)
 add_subdirectory(Geometry)
 add_subdirectory(HGT)
-add_subdirectory(Output)
 add_subdirectory(Polygon)
 add_subdirectory(landcover)

src/Lib/Output/CMakeLists.txt

@@ -1,5 +0,0 @@
-
-
-add_library(Output STATIC 
-    output.cxx output.hxx
-)

src/Lib/Polygon/chop-bin.cxx

@@ -37,8 +37,6 @@
 #include <simgear/structure/exception.hxx>
 #include <simgear/misc/sg_path.hxx>
 
-#include <Output/output.hxx>
-
 #include "index.hxx"
 #include "simple_clip.hxx"
 #include "chop.hxx"