Changes in src/Makefile.am [e58856b:31b09e]

File:

• src/Makefile.am (modified) (7 diffs)

src/Makefile.am

@@ -113 +113 @@
   Descriptors/AtomTypeDescriptor.cpp \
   Descriptors/MoleculeDescriptor.cpp \
-  Descriptors/MoleculeIdDescriptor.cpp 
+  Descriptors/MoleculeIdDescriptor.cpp \ 
+  Descriptors/MoleculeNameDescriptor.cpp \ 
+  Descriptors/MoleculePtrDescriptor.cpp 
                                    
-                                   
+
 DESCRIPTORHEADER = Descriptors/AtomDescriptor.hpp \
   Descriptors/AtomIdDescriptor.hpp \
   Descriptors/AtomTypeDescriptor.hpp \
   Descriptors/MoleculeDescriptor.hpp \
-  Descriptors/MoleculeIdDescriptor.hpp
+  Descriptors/MoleculeIdDescriptor.hpp \
+  Descriptors/MoleculeNameDescriptor.hpp \
+  Descriptors/MoleculePtrDescriptor.hpp
                                    
 EXCEPTIONSOURCE = Exceptions/CustomException.cpp \
@@ -148 +152 @@
   config.cpp \
   element.cpp \
+  elements_db.cpp \
   ellipsoid.cpp \
   errorlogger.cpp \
@@ -156 +161 @@
   Line.cpp \
   linkedcell.cpp \
-  lists.cpp \
   log.cpp \
   logger.cpp \
-  memoryusageobserver.cpp \
   moleculelist.cpp \
   molecule.cpp \
@@ -170 +173 @@
   periodentafel.cpp \
   Plane.cpp \
+  Space.cpp \
   tesselation.cpp \
   tesselationhelpers.cpp \
   triangleintersectionlist.cpp \
+  vector.cpp \
+  vector_ops.cpp \
   verbose.cpp \
-  vector_ops.cpp \
   World.cpp
 
@@ -193 +198 @@
   defs.hpp \
   element.hpp \
+  elements_db.hpp \
   ellipsoid.hpp \
   errorlogger.hpp \
@@ -204 +210 @@
   log.hpp \
   logger.hpp \
-  memoryallocator.hpp \
-  memoryusageobserver.hpp \
   molecule.hpp \
   molecule_template.hpp \
@@ -218 +222 @@
   vector_ops.hpp \
   World.hpp 
+
+# the following files are no longer used:
+#  memoryallocator.hpp \
+#  memoryallocator.cpp \
+#  memoryusageobserver.hpp \
+#  memoryusageobserver.cpp
 
 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB)