Changeset 9869 in orxonox.OLD for trunk/src/lib/lang/Makefile.am

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/lang/Makefile.am (modified) (2 diffs)

trunk/src/lib/lang/Makefile.am

@@ -1 @@
-MAINSRCDIR=../..
-include $(MAINSRCDIR)/defs/include_paths.am
-
-LIB_PREFIX=$(MAINSRCDIR)/lib
-include $(MAINSRCDIR)/lib/BuildLibs.am
+INCLUDES = -I../..
+INCLUDES +=-I..
+INCLUDES +=-I../util
 
 noinst_LIBRARIES = libORXlang.a
@@ -9 +7 @@
 libORXlang_a_SOURCES = \
                 base_object.cc \
-                class_list.cc \
-                new_class_id.cc \
-                new_object_list.cc
+                class_id.cc \
+                object_list.cc
 
 noinst_HEADERS = \
                 base_object.h \
-                class_list.h \
-                new_class_id.h \
-                new_object_list.h
-
-
-
-
-
-## THIS ALL IS JUST FOR TESTING!!
-check_PROGRAMS = test_object_list
-
-test_object_list_SOURCES = \
-                test_object_list.cc
-
-test_object_list_DEPENDENCIES = libORXlang.a
-
-test_object_list_LDADD = \
-                $(MAINSRCDIR)/util/libORXutils.a \
-                $(libORXlibs_a_LIBRARIES_) \
-                $(MAINSRCDIR)/world_entities/libORXwe.a \
-                $(libORXlibs_a_LIBRARIES_) \
-                $(MAINSRCDIR)/util/libORXutils.a
-
-#test_object_list_LDADD = \
-                libORXlang.a
+                class_id.h \
+                object_list.h