Index: trunk/src/world_entities/Makefile.am
===================================================================
--- trunk/src/world_entities/Makefile.am	(revision 7110)
+++ trunk/src/world_entities/Makefile.am	(revision 7151)
@@ -1,138 +1,52 @@
-#MAINSRCDIR=..
-#include $(MAINSRCDIR)/defs/include_paths.am
+MAINSRCDIR=..
+include $(MAINSRCDIR)/defs/include_paths.am
+include WorldEntities.am
 
-#noinst_LIBRARIES = libORXworld_entities.a
-#libORXworld_entities_a_SOURCES =
+
+noinst_LIBRARIES = libORXwe.a
 #subdirs = .
 
-WorldEntities_SOURCES_ = \
-                  world_entities/world_entity.cc \
-                  world_entities/camera.cc \
-                  world_entities/playable.cc \
-                  world_entities/player.cc \
-                  world_entities/npcs/npc.cc \
-                  world_entities/npcs/npc_test1.cc \
-                  world_entities/npcs/npc_test.cc \
-                  world_entities/npcs/ground_turret.cc \
-                  world_entities/environment.cc \
-                  world_entities/skysphere.cc \
-                  world_entities/skybox.cc \
-                  world_entities/terrain.cc \
-                  world_entities/satellite.cc \
-                  world_entities/movie_entity.cc \
-                  world_entities/recorder.cc \
-                  world_entities/character_attributes.cc \
-                  world_entities/test_entity.cc \
-		  world_entities/planet.cc \
-                  \
-                  world_entities/weapons/weapon_manager.cc \
-                  world_entities/weapons/ammo_container.cc \
-                  world_entities/weapons/weapon.cc \
-                  world_entities/weapons/test_gun.cc \
-                  world_entities/weapons/turret.cc \
-                  world_entities/weapons/aiming_turret.cc \
-                  world_entities/weapons/targeting_turret.cc \
-                  world_entities/weapons/cannon.cc \
-                  world_entities/weapons/hyperblaster.cc \
-                  world_entities/weapons/aim.cc \
-                  world_entities/weapons/crosshair.cc \
-                  \
-                  world_entities/projectiles/projectile.cc \
-                  world_entities/projectiles/bomb.cc \
-                  world_entities/projectiles/laser.cc \
-                  world_entities/projectiles/test_bullet.cc \
-                  world_entities/projectiles/rocket.cc \
-                  world_entities/projectiles/guided_missile.cc \
-                  world_entities/projectiles/hyperblast.cc \
-                  \
-                  world_entities/power_ups/power_up.cc \
-                  world_entities/power_ups/turret_power_up.cc \
-                  world_entities/power_ups/laser_power_up.cc \
-                  world_entities/power_ups/weapon_power_up.cc \
-                  world_entities/power_ups/param_power_up.cc \
-                  \
-                  world_entities/space_ships/space_ship.cc \
-                  world_entities/space_ships/helicopter.cc \
-                  world_entities/space_ships/hover.cc \
-                  world_entities/space_ships/turbine_hover.cc \
-                  world_entities/creatures/md2_creature.cc \
-                  \
-                  world_entities/spawning_point.cc \
-                  \
-                  world_entities/environments/water.cc \
-                  world_entities/environments/model_entity.cc \
-                  world_entities/environments/building.cc \
-                  \
-                  world_entities/elements/image_entity.cc \
-                  world_entities/elements/text_element.cc \
-                  \
-                  world_entities/effects/explosion.cc \
-                  world_entities/effects/lightning_bolt.cc
+## THESE ARE THE BASE CLASSES OF ALL WORLD_ENTITIES
+libORXwe_a_SOURCES = \
+		world_entity.cc \
+		\
+		camera.cc \
+		playable.cc \
+		player.cc \
+		\
+		npcs/npc.cc \
+		\
+		weapons/weapon_manager.cc \
+		weapons/weapon.cc \
+		weapons/ammo_container.cc \
+		projectiles/projectile.cc \
+		\
+		power_ups/power_up.cc \
+		\
+		spawning_point.cc
 
 
-WorldEntities_HEADERS_ = \
-                 world_entities/world_entity.h \
-                 world_entities/camera.h \
-                 world_entities/extendable.h \
-                 world_entities/playable.h \
-                 world_entities/player.h \
-                 world_entities/npcs/npc.h \
-                 world_entities/npcs/npc_test.h \
-                 world_entities/npcs/npc_test1.h \
-                 world_entities/npcs/ground_turret.h \
-                 world_entities/environment.h \
-                 world_entities/skysphere.h \
-                 world_entities/skybox.h \
-                 world_entities/terrain.h \
-                 world_entities/satellite.h \
-                 world_entities/movie_entity.h \
-                 world_entities/recorder.h \
-                 world_entities/character_attributes.h \
-                 world_entities/test_entity.h \
-                 world_entities/planet.h \
-                 \
-                 world_entities/weapons/weapon_manager.h \
-                 world_entities/weapons/ammo_container.h \
-                 world_entities/weapons/weapon.h \
-                 world_entities/weapons/test_gun.h \
-                 world_entities/weapons/cannon.h \
-                 world_entities/weapons/hyperblaster.h \
-                 world_entities/weapons/turret.h \
-                 world_entities/weapons/aiming_turret.h \
-                 world_entities/weapons/targeting_turret.h \
-                 world_entities/weapons/aim.h \
-                 world_entities/weapons/crosshair.h \
-                 \
-                 world_entities/projectiles/projectile.h \
-                 world_entities/projectiles/bomb.h \
-                 world_entities/projectiles/laser.h \
-                 world_entities/projectiles/test_bullet.h \
-                 world_entities/projectiles/rocket.h \
-                 world_entities/projectiles/guided_missile.h \
-                 world_entities/projectiles/hyperblast.h \
-                 \
-                 world_entities/power_ups/power_up.h \
-                 world_entities/power_ups/turret_power_up.h \
-                 world_entities/power_ups/laser_power_up.h \
-                 world_entities/power_ups/param_power_up.h \
-                 world_entities/power_ups/weapon_power_up.h \
-                 \
-                 world_entities/space_ships/space_ship.h \
-                 world_entities/space_ships/helicopter.h \
-                 world_entities/space_ships/hover.h \
-                 world_entities/space_ships/turbine_hover.h \
-                 world_entities/creatures/md2_creature.h \
-                 \
-                 world_entities/spawning_point.h \
-                 \
-                 world_entities/environments/water.h \
-                 world_entities/environments/model_entity.h \
-                 world_entities/environments/building.h \
-                 \
-                 world_entities/elements/image_entity.h \
-                 world_entities/elements/text_element.h \
-                 \
-                 world_entities/effects/explosion.h \
-                 world_entities/effects/lightning_bolt.h
+noinst_HEADERS  = \
+		world_entity.h \
+		\
+		camera.h \
+		extendable.h \
+		playable.h \
+		player.h \
+		\
+		npcs/npc.h \
+		\
+		weapons/weapon_manager.h \
+		weapons/weapon.h \
+		weapons/ammo_container.h \
+		projectiles/projectile.h \
+		\
+		power_ups/power_up.h \
+		\
+		spawning_point.h
+		\
+		\
+		$(WorldEntities_HEADERS_)
 
 
+EXTRA_DIST = WorldEntities.am
