diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -29,7 +29,7 @@ boot_OBJECTDIR = $(PROJECT_OBJECTDIR)/$(boot_PREFIX) boot_INSTALLDIR = $(boot_OBJECTDIR) boot_BINARYDIR = $(boot_OBJECTDIR)/bin boot_LIBRARY_CLASSDIR = $(main_LIBRARY_CLASSDIR) -boot_TOOLS_CLASSDIR = $(boot_OBJECTDIR)/tools +boot_TOOLS_CLASSDIR = $(boot_OBJECTDIR)/lib/tools boot_JC_OUTPUTDIR = $(boot_TOOLS_CLASSDIR) boot_JC_CLASSPATH = $(boot_JC_OUTPUTDIR):$(boot_LIBRARY_CLASSDIR) boot_SC_BOOTCLASSPATH = @@ -41,8 +41,8 @@ main_PREFIX = main main_OBJECTDIR = $(PROJECT_OBJECTDIR)/$(main_PREFIX) main_INSTALLDIR = $(PROJECT_ROOT) main_BINARYDIR = $(PROJECT_BINARYDIR) -main_LIBRARY_CLASSDIR = $(main_OBJECTDIR)/library -main_TOOLS_CLASSDIR = $(main_OBJECTDIR)/tools +main_LIBRARY_CLASSDIR = $(main_OBJECTDIR)/lib/$(LIBRARY_NAME) +main_TOOLS_CLASSDIR = $(main_OBJECTDIR)/lib/$(TOOLS_NAME) main_JC_OUTPUTDIR = $(main_TOOLS_CLASSDIR) main_JC_CLASSPATH = $(main_JC_OUTPUTDIR):$(main_LIBRARY_CLASSDIR) main_SC_BOOTCLASSPATH = $(JRE_JARFILE) @@ -54,8 +54,8 @@ test_PREFIX = test test_OBJECTDIR = $(PROJECT_OBJECTDIR)/$(test_PREFIX) test_INSTALLDIR = $(test_OBJECTDIR) test_BINARYDIR = $(test_OBJECTDIR)/bin -test_LIBRARY_CLASSDIR = $(test_OBJECTDIR)/library -test_TOOLS_CLASSDIR = $(test_OBJECTDIR)/tools +test_LIBRARY_CLASSDIR = $(test_OBJECTDIR)/lib/$(LIBRARY_NAME) +test_TOOLS_CLASSDIR = $(test_OBJECTDIR)/lib/$(TOOLS_NAME) test_JC_OUTPUTDIR = $(test_TOOLS_CLASSDIR) test_JC_CLASSPATH = $(test_JC_OUTPUTDIR):$(test_LIBRARY_CLASSDIR) test_SC_BOOTCLASSPATH = $(JRE_JARFILE) @@ -390,6 +390,7 @@ $(latest)meta-jc : $(META_JC_FILES) # Targets - scala library PROJECT_SOURCES += $(LIBRARY_SOURCES) +LIBRARY_NAME = $(PROJECT_NAME) LIBRARY_ROOT = $(PROJECT_SOURCEDIR)/scala LIBRARY_LIST += $(call READLIST,$(PROJECT_LISTDIR)/library.lst) LIBRARY_SOURCES += $(LIBRARY_LIST:%=$(LIBRARY_ROOT)/%) |