-LIBNAME_O := $(LEVEL)/lib/Release/lib$(LIBRARYNAME).so
-LIBNAME_G := $(LEVEL)/lib/Debug/lib$(LIBRARYNAME).so
-LIBNAME_AO := $(LEVEL)/lib/Release/lib$(LIBRARYNAME).a
-LIBNAME_AG := $(LEVEL)/lib/Debug/lib$(LIBRARYNAME).a
+# Make sure there isn't any extranous whitespace on the LIBRARYNAME option
+LIBRARYNAME := $(strip $(LIBRARYNAME))
+
+LIBNAME_O := $(LIBRELEASE)/lib$(LIBRARYNAME).so
+LIBNAME_P := $(LIBPROFILE)/lib$(LIBRARYNAME).so
+LIBNAME_G := $(LIBDEBUG)/lib$(LIBRARYNAME).so
+LIBNAME_AO := $(LIBRELEASE)/lib$(LIBRARYNAME).a
+LIBNAME_AP := $(LIBPROFILE)/lib$(LIBRARYNAME).a
+LIBNAME_AG := $(LIBDEBUG)/lib$(LIBRARYNAME).a
+LIBNAME_OBJO := $(LIBRELEASE)/$(LIBRARYNAME).o
+LIBNAME_OBJP := $(LIBPROFILE)/$(LIBRARYNAME).o
+LIBNAME_OBJG := $(LIBDEBUG)/$(LIBRARYNAME).o
+
+
+ifndef ENABLE_OPTIMIZED
+BUILD_LIBNAME_G := $(LIBNAME_G)
+ifndef DONT_BUILD_RELINKED
+BUILD_LIBNAME_OBJG := $(LIBNAME_OBJG)
+endif
+ifdef BUILD_ARCHIVE
+BUILD_LIBNAME_AG := $(LIBNAME_AG)
+endif
+endif
+
+# If optimized builds are enabled...
+ifdef ENABLE_OPTIMIZED
+ ifdef ENABLE_PROFILING
+ BUILD_LIBNAME_O := $(LIBNAME_P)
+ ifndef DONT_BUILD_RELINKED
+ BUILD_LIBNAME_OBJO := $(LIBNAME_OBJP)
+ endif
+ ifdef BUILD_ARCHIVE
+ BUILD_LIBNAME_AO := $(LIBNAME_AP)
+ endif
+ else
+ BUILD_LIBNAME_O := $(LIBNAME_O)
+ ifndef DONT_BUILD_RELINKED
+ BUILD_LIBNAME_OBJO := $(LIBNAME_OBJO)
+ endif
+ ifdef BUILD_ARCHIVE
+ BUILD_LIBNAME_AO := $(LIBNAME_AO)
+ endif
+ endif
+endif