Merge branch 'next' of git://gitorious.org/fg/simgear into next

[simgear.git] / simgear / hla / Makefile.am

diff --git a/simgear/hla/Makefile.am b/simgear/hla/Makefile.am
index e4af153109319ef5aeab332e9d3774008c62d7e8..e214e6a0e1dc69692ad660ecee349931dc426621 100644 (file)
--- a/simgear/hla/Makefile.am
+++ b/simgear/hla/Makefile.am
@@ -29,15 +29,13 @@ libsghla_a_HEADERS = \
        HLAVariantDataType.hxx
 
 libsghla_a_SOURCES = \
-       RTIObjectClass.cxx \
-       RTIObjectInstance.cxx \
-       RTIFederate.cxx \
        HLAArrayDataElement.cxx \
        HLAArrayDataType.cxx \
        HLABasicDataElement.cxx \
        HLABasicDataType.cxx \
        HLADataElement.cxx \
        HLADataType.cxx \
+       HLADataTypeVisitor.cxx \
        HLAEnumeratedDataElement.cxx \
        HLAEnumeratedDataType.cxx \
        HLAFederate.cxx \
@@ -53,17 +51,23 @@ libsghla_a_SOURCES = \
 
 if ENABLE_HLA13
 
-lib_LIBRARIES += libsghla13.a
-
-libsghla13_adir = @includedir@/hla
+lib_LIBRARIES += libsgrti13.a
 
-libsghla13_a_HEADERS = \
-       HLA13Federate.hxx
+libsgrti13_adir = @includedir@/hla
 
-libsghla13_a_SOURCES = \
+libsgrti13_a_SOURCES = \
        RTI13ObjectClass.cxx \
        RTI13ObjectInstance.cxx \
-       RTI13Federate.cxx \
-       HLA13Federate.cxx
+       RTI13Federate.cxx
 
 endif
+
+lib_LIBRARIES += libsgrti.a
+
+libsgrti_adir = @includedir@/hla
+
+libsgrti_a_SOURCES = \
+       RTIObjectClass.cxx \
+       RTIObjectInstance.cxx \
+       RTIFederate.cxx
+