apache2.rb in passenger-5.0.0.beta1

- old
+ new

@@ -1,7 +1,7 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal
@@ -48,11 +48,10 @@
 		ext/apache2/DirectoryMapper.h
 		ext/common/AgentsStarter.h
 		ext/common/Exceptions.h
 		ext/common/Logging.h
 		ext/common/RandomGenerator.h
-		ext/common/ServerInstanceDir.h
 		ext/common/Utils.h
 		ext/common/Utils/Timer.h)
 }
 APACHE2_MODULE_OBJECTS = APACHE2_MODULE_INPUT_FILES.keys
 APACHE2_MOD_PASSENGER_O = APACHE2_OUTPUT_DIR + "mod_passenger.o"
@@ -68,12 +67,12 @@
 
 APACHE2_MODULE_BOOST_OXT_LIBRARY = define_libboost_oxt_task("apache2",
 	APACHE2_OUTPUT_DIR + "module_libboost_oxt",
 	PlatformInfo.apache2_module_cflags)
 APACHE2_MODULE_COMMON_LIBRARIES  = COMMON_LIBRARY.
-	only(:base, 'ApplicationPool2/AppTypes.o', 'Utils/Base64.o',
-		'Utils/MD5.o', 'Utils/LargeFiles.o').
+	only(:base, 'ApplicationPool2/AppTypes.o',
+		'Utils/MD5.o', 'Utils/modp_b64.o').
 	set_namespace("apache2").
 	set_output_dir(APACHE2_OUTPUT_DIR + "module_libpassenger_common").
 	define_tasks(PlatformInfo.apache2_module_cflags).
 	link_objects
 
@@ -88,14 +87,10 @@
 
 
 desc "Build Apache 2 module"
 task :apache2 => [
 	APACHE2_MODULE,
-	AGENT_OUTPUT_DIR + 'PassengerHelperAgent',
-	AGENT_OUTPUT_DIR + 'PassengerWatchdog',
-	AGENT_OUTPUT_DIR + 'PassengerLoggingAgent',
-	AGENT_OUTPUT_DIR + 'SpawnPreparer',
-	AGENT_OUTPUT_DIR + 'TempDirToucher',
+	AGENT_OUTPUT_DIR + AGENT_EXE,
 	NATIVE_SUPPORT_TARGET
 ].compact
 
 # Workaround for https://github.com/jimweirich/rake/issues/274
 task :_apache2 => :apache2