Index: makefile
===================================================================
--- makefile	(revision e5d29360c2128093a9e2ee243d4a187a8f1e9470)
+++ makefile	(revision ebd353806cbf06ffc98ff5f5a8f0cf5d637f21f4)
@@ -1,21 +1,14 @@
-# NOTE: Currently, this assumes that I have first compiled the .java files into .class files
-
-# Use something like "LostPerception: MAP_FILE_DEPS = maps/*.txt" to specify var for a specific target
-
 ASTAR_DEPS = astar/AStarMap.class astar/AStarNode.class astar/AStarSearch.class astar/BinaryHeap.class astar/QuadTree.class
 COLLISION_DEPS = collision/Bound.class
-#GAMEGUI_DEPS = gamegui/Align.class gamegui/Animation.class gamegui/Button.class gamegui/Label.class gamegui/Listable.class gamegui/Member.class gamegui/ScrollBar.class gamegui/ScrollList.class gamegui/Textbox.class gamegui/Window.class
-GAMEGUI_DEPS = gamegui/Align.class gamegui/Animation.class gamegui/Button.class gamegui/Label.class gamegui/Member.class gamegui/ScrollBar.class gamegui/ScrollList.class gamegui/Window.class
+GAMEGUI_DEPS = gamegui/Align.class gamegui/Animation.class gamegui/Button.class gamegui/Label.class gamegui/Listable.class gamegui/Member.class gamegui/ScrollBar.class gamegui/ScrollList.class gamegui/Textbox.class gamegui/Window.class
 UTILS_DEPS = utils/DynamicImage.class utils/Utils.class utils/WrappedString.class
 
 MAIN_DEPS = main/Action.class main/Armor.class main/Creature.class main/Dialog.class main/Direction.class main/Effect.class main/Enemy.class main/Item.class main/Location.class main/LostHavenRPG.class main/Map.class main/MapImage.class main/MapObject.class main/MapType.class main/Model.class main/NPC.class main/Player.class main/StatType.class main/Tile.class main/Weapon.class
 
-#GAMEGUI_INNER_DEPS = gamegui/Button\$$1.class gamegui/Label\$$1.class
-LostPerception: GAMEGUI_INNER_DEPS = gamegui/Button\$$1.class gamegui/Label\$$1.class
-#MAIN_INNER_DEPS = main/Armor\$$ArmorType.class main/Effect\$$MoveSpeed.class main/Effect\$$Hitpoints.class main/Effect\$$Manapoints.class main/Effect\$$Damage.class main/Effect\$$AttackSpeed.class main/LostHavenRPG\$$1.class main/LostHavenRPG\$$AuxState.class main/LostHavenRPG\$$GameState.class main/Model\$$1.class
-LostPerception: MAIN_INNER_DEPS = main/Armor\$$ArmorType.class main/Effect\$$AttackSpeed.class main/Effect\$$Damage.class main/Effect\$$Hitpoints.class main/Effect\$$MoveSpeed.class main/LostHavenRPG\$$1.class main/LostHavenRPG\$$AuxState.class main/LostHavenRPG\$$GameState.class main/Model\$$1.class
-LostPerception: UTILS_INNER_DEPS = utils/Utils\$$1.class
+GAMEGUI_INNER_DEPS = gamegui/Button\$$1.class gamegui/Label\$$1.class
+MAIN_INNER_DEPS = main/Armor\$$ArmorType.class main/Effect\$$MoveSpeed.class main/Effect\$$Hitpoints.class main/Effect\$$Manapoints.class main/Effect\$$Damage.class main/Effect\$$AttackSpeed.class main/LostHavenRPG\$1.class main/LostHavenRPG\$$AuxState.class main/LostHavenRPG\$$GameState.class main/Model\$$1.class
+UTILS_INNER_DEPS = utils/Utils\$$1.class
 
-LostPerception: INNER_DEPS = $(GAMEGUI_INNER_DEPS) $(MAIN_INNER_DEPS) $(UTILS_INNER_DEPS)
+INNER_DEPS = $(GAMEGUI_INNER_DEPS) $(MAIN_INNER_DEPS) $(UTILS_INNER_DEPS)
 
 DIALOG_FILE_DEPS = dialog/*.txt
@@ -26,25 +19,4 @@
 FILE_DEPS = $(DIALOG_FILE_DEPS) $(IMAGE_FILE_DEPS) $(MAP_FILE_DEPS)
 
-LostPerception: $(CLASS_DEPS) $(FILE_DEPS)
-	jar cfe $@.jar main.LostHavenRPG $^ $(INNER_DEPS)
-
-ASTAR_DEPS = astar/AStarMap.class astar/AStarNode.class astar/QuadTree.class
-COLLISION_DEPS = collision/Bound.class
-GAMEGUI_DEPS = gamegui/Align.class gamegui/Animation.class gamegui/Button.class gamegui/Label.class gamegui/Member.class gamegui/ScrollBar.class gamegui/Textbox.class gamegui/Window.class
-UTILS_DEPS = utils/DynamicImage.class utils/Utils.class
-
-MAIN_DEPS = main/Action.class main/Creature.class main/Direction.class main/Enemy.class main/Item.class main/Location.class main/Map.class main/MapEditor.class main/MapImage.class main/MapObject.class main/MapType.class main/Model.class main/Player.class main/StatType.class main/Tile.class 
-
-MapEditor: GAMEGUI_INNER_DEPS = gamegui/Button\$$1.class gamegui/Label\$$1.class
-MapEditor: MAIN_INNER_DEPS = main/MapEditor\$$1.class main/MapEditor\$$AuxState.class  main/MapEditor\$$GroundType.class main/MapEditor\$$State.class main/Model\$$1.class
-MapEditor: UTILS_INNER_DEPS = utils/Utils\$$1.class
-
-MapEditor: INNER_DEPS = $(GAMEGUI_INNER_DEPS) $(MAIN_INNER_DEPS) $(UTILS_INNER_DEPS)
-
-IMAGE_FILE_DEPS = images/*/*.png images/creatures/*/*/*.png
-
-CLASS_DEPS = $(MAIN_DEPS) $(ASTAR_DEPS) $(GAMEGUI_DEPS) $(COLLISION_DEPS) $(UTILS_DEPS)
-FILE_DEPS = $(IMAGE_FILE_DEPS)
-
-MapEditor: $(CLASS_DEPS) $(FILE_DEPS)
-	jar cfe $@.jar main.MapEditor $^ $(INNER_DEPS)
+LostHavenRPG: $(CLASS_DEPS) $(FILE_DEPS)
+	jar cfe $@.jar main.$@ $^ $(INNER_DEPS)