Rename targets

This commit is contained in:
k-hara 2016-04-09 21:01:23 +09:00
parent 32e8eccc20
commit f51939d454
2 changed files with 42 additions and 44 deletions

View file

@ -102,14 +102,14 @@ test.exe : test.obj $(LIB)
# ti_bit.obj ti_Abit.obj # ti_bit.obj ti_Abit.obj
# The separation is a workaround for bug 4904 (optlink bug 3372). # The separation is a workaround for bug 4904 (optlink bug 3372).
SRC_STD_1_HEAVY= \ SRC_STD_1= \
std\stdio.d \ std\stdio.d \
std\stdiobase.d \ std\stdiobase.d \
std\string.d \ std\string.d \
std\format.d \ std\format.d \
std\file.d std\file.d
SRC_STD_2a_HEAVY= \ SRC_STD_2a= \
std\array.d \ std\array.d \
std\functional.d \ std\functional.d \
std\path.d \ std\path.d \
@ -149,7 +149,6 @@ SRC_STD_3a= \
SRC_STD_3b= \ SRC_STD_3b= \
std\datetime.d std\datetime.d
#can't place SRC_STD_DIGEST in SRC_STD_REST because of out-of-memory issues
SRC_STD_DIGEST= \ SRC_STD_DIGEST= \
std\digest\crc.d \ std\digest\crc.d \
std\digest\sha.d \ std\digest\sha.d \
@ -181,17 +180,17 @@ SRC_STD_ALGO= \
std\algorithm\sorting.d \ std\algorithm\sorting.d \
std\algorithm\internal.d std\algorithm\internal.d
SRC_STD_5_HEAVY= \ SRC_STD_5= \
$(SRC_STD_ALGO) $(SRC_STD_ALGO)
SRC_STD_LOGGER= \ SRC_STD_EXP_LOGGER= \
std\experimental\logger\core.d \ std\experimental\logger\core.d \
std\experimental\logger\filelogger.d \ std\experimental\logger\filelogger.d \
std\experimental\logger\multilogger.d \ std\experimental\logger\multilogger.d \
std\experimental\logger\nulllogger.d \ std\experimental\logger\nulllogger.d \
std\experimental\logger\package.d std\experimental\logger\package.d
SRC_STD_ALLOC_BB= \ SRC_STD_EXP_ALLOC_BB= \
std\experimental\allocator\building_blocks\affix_allocator.d \ std\experimental\allocator\building_blocks\affix_allocator.d \
std\experimental\allocator\building_blocks\allocator_list.d \ std\experimental\allocator\building_blocks\allocator_list.d \
std\experimental\allocator\building_blocks\bitmapped_block.d \ std\experimental\allocator\building_blocks\bitmapped_block.d \
@ -208,7 +207,7 @@ SRC_STD_ALLOC_BB= \
std\experimental\allocator\building_blocks\stats_collector.d \ std\experimental\allocator\building_blocks\stats_collector.d \
std\experimental\allocator\building_blocks\package.d std\experimental\allocator\building_blocks\package.d
SRC_STD_ALLOC= \ SRC_STD_EXP_ALLOC= \
std\experimental\allocator\common.d \ std\experimental\allocator\common.d \
std\experimental\allocator\gc_allocator.d \ std\experimental\allocator\gc_allocator.d \
std\experimental\allocator\mallocator.d \ std\experimental\allocator\mallocator.d \
@ -216,7 +215,7 @@ SRC_STD_ALLOC= \
std\experimental\allocator\showcase.d \ std\experimental\allocator\showcase.d \
std\experimental\allocator\typed.d \ std\experimental\allocator\typed.d \
std\experimental\allocator\package.d \ std\experimental\allocator\package.d \
$(SRC_STD_ALLOC_BB) $(SRC_STD_EXP_ALLOC_BB)
SRC_STD_6= \ SRC_STD_6= \
std\variant.d \ std\variant.d \
@ -228,10 +227,10 @@ SRC_STD_6= \
std\zip.d \ std\zip.d \
std\cstream.d \ std\cstream.d \
$(SRC_STD_CONTAINER) \ $(SRC_STD_CONTAINER) \
$(SRC_STD_LOGGER) \ $(SRC_STD_EXP_LOGGER) \
$(SRC_STD_ALLOC) $(SRC_STD_EXP_ALLOC)
SRC_STD_REST= \ SRC_STD_7= \
std\stdint.d \ std\stdint.d \
std\json.d \ std\json.d \
std\parallelism.d \ std\parallelism.d \
@ -239,14 +238,14 @@ SRC_STD_REST= \
std\process.d std\process.d
SRC_STD_ALL= \ SRC_STD_ALL= \
$(SRC_STD_1_HEAVY) \ $(SRC_STD_1) \
$(SRC_STD_2a_HEAVY) \ $(SRC_STD_2a) \
$(SRC_STD_3) \ $(SRC_STD_3) \
$(SRC_STD_3a) \ $(SRC_STD_3a) \
$(SRC_STD_3b) \ $(SRC_STD_3b) \
$(SRC_STD_4) \ $(SRC_STD_4) \
$(SRC_STD_6) \ $(SRC_STD_6) \
$(SRC_STD_REST) $(SRC_STD_7)
SRC= \ SRC= \
unittest.d \ unittest.d \
@ -320,7 +319,7 @@ SRC_STD_RANGE= \
std\range\primitives.d \ std\range\primitives.d \
std\range\interfaces.d std\range\interfaces.d
SRC_STD_NDSLICE= \ SRC_STD_EXP_NDSLICE= \
std\experimental\ndslice\package.d \ std\experimental\ndslice\package.d \
std\experimental\ndslice\iteration.d \ std\experimental\ndslice\iteration.d \
std\experimental\ndslice\selection.d \ std\experimental\ndslice\selection.d \
@ -404,14 +403,14 @@ SRC_ETC_C= \
etc\c\odbc\sqltypes.d \ etc\c\odbc\sqltypes.d \
etc\c\odbc\sqlucode.d etc\c\odbc\sqlucode.d
SRC_EXPERIMENTAL= \ SRC_STD_EXP= \
std\experimental\typecons.d std\experimental\typecons.d
SRC_TO_COMPILE= \ SRC_TO_COMPILE= \
$(SRC_STD_ALL) \ $(SRC_STD_ALL) \
$(SRC_STD_ALGO) \ $(SRC_STD_ALGO) \
$(SRC_STD_RANGE) \ $(SRC_STD_RANGE) \
$(SRC_STD_NDSLICE) \ $(SRC_STD_EXP_NDSLICE) \
$(SRC_STD_REGEX) \ $(SRC_STD_REGEX) \
$(SRC_STD_NET) \ $(SRC_STD_NET) \
$(SRC_STD_C) \ $(SRC_STD_C) \
@ -423,7 +422,7 @@ SRC_TO_COMPILE= \
$(SRC_STD_INTERNAL_WINDOWS) \ $(SRC_STD_INTERNAL_WINDOWS) \
$(SRC_ETC) \ $(SRC_ETC) \
$(SRC_ETC_C) \ $(SRC_ETC_C) \
$(SRC_EXPERIMENTAL) $(SRC_STD_EXP)
SRC_ZLIB= \ SRC_ZLIB= \
etc\c\zlib\crc32.h \ etc\c\zlib\crc32.h \
@ -634,23 +633,23 @@ UNITTEST_OBJS= \
unittest8f.obj unittest8f.obj
unittest : $(LIB) unittest : $(LIB)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest1.obj $(SRC_STD_1_HEAVY) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest1.obj $(SRC_STD_1)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest2.obj $(SRC_STD_RANGE) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest2.obj $(SRC_STD_RANGE)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest2.obj $(SRC_STD_NDSLICE) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest2.obj $(SRC_STD_EXP_NDSLICE)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest2a.obj $(SRC_STD_2a_HEAVY) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest2a.obj $(SRC_STD_2a)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest3.obj $(SRC_STD_3) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest3.obj $(SRC_STD_3)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest3a.obj $(SRC_STD_3a) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest3a.obj $(SRC_STD_3a)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest3b.obj $(SRC_STD_3b) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest3b.obj $(SRC_STD_3b)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest4.obj $(SRC_STD_4) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest4.obj $(SRC_STD_4)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest5.obj $(SRC_STD_5_HEAVY) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest5.obj $(SRC_STD_5)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest6.obj $(SRC_STD_6) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest6.obj $(SRC_STD_6)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest7.obj $(SRC_STD_REST) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest7.obj $(SRC_STD_7)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest8a.obj $(SRC_STD_REGEX) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest8a.obj $(SRC_STD_REGEX)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest8b.obj $(SRC_STD_NET) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest8b.obj $(SRC_STD_NET)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest8c.obj $(SRC_STD_C) $(SRC_STD_WIN) $(SRC_STD_C_WIN) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest8c.obj $(SRC_STD_C) $(SRC_STD_WIN) $(SRC_STD_C_WIN)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest8d.obj $(SRC_STD_INTERNAL) $(SRC_STD_INTERNAL_DIGEST) $(SRC_STD_INTERNAL_MATH) $(SRC_STD_INTERNAL_WINDOWS) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest8d.obj $(SRC_STD_INTERNAL) $(SRC_STD_INTERNAL_DIGEST) $(SRC_STD_INTERNAL_MATH) $(SRC_STD_INTERNAL_WINDOWS)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest8e.obj $(SRC_ETC) $(SRC_ETC_C) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest8e.obj $(SRC_ETC) $(SRC_ETC_C)
$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest8f.obj $(SRC_EXPERIMENTAL) $(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest8f.obj $(SRC_STD_EXP)
$(DMD) $(UDFLAGS) -L/co -unittest unittest.d $(UNITTEST_OBJS) \ $(DMD) $(UDFLAGS) -L/co -unittest unittest.d $(UNITTEST_OBJS) \
$(ZLIB) $(DRUNTIMELIB) $(ZLIB) $(DRUNTIMELIB)
.\unittest.exe .\unittest.exe

View file

@ -106,14 +106,14 @@ test.exe : test.obj $(LIB)
# ti_bit.obj ti_Abit.obj # ti_bit.obj ti_Abit.obj
# The separation is a workaround for bug 4904 (optlink bug 3372). # The separation is a workaround for bug 4904 (optlink bug 3372).
SRC_STD_1_HEAVY= \ SRC_STD_1= \
std\stdio.d \ std\stdio.d \
std\stdiobase.d \ std\stdiobase.d \
std\string.d \ std\string.d \
std\format.d \ std\format.d \
std\file.d std\file.d
SRC_STD_2a_HEAVY= \ SRC_STD_2a= \
std\array.d \ std\array.d \
std\functional.d \ std\functional.d \
std\path.d \ std\path.d \
@ -157,7 +157,6 @@ SRC_STD_3b= \
std\concurrency.d \ std\concurrency.d \
std\concurrencybase.d std\concurrencybase.d
#can't place SRC_STD_DIGEST in SRC_STD_REST because of out-of-memory issues
SRC_STD_DIGEST= \ SRC_STD_DIGEST= \
std\digest\crc.d \ std\digest\crc.d \
std\digest\sha.d \ std\digest\sha.d \
@ -195,14 +194,14 @@ SRC_STD_ALGO= \
$(SRC_STD_ALGO_1) \ $(SRC_STD_ALGO_1) \
$(SRC_STD_ALGO_2) $(SRC_STD_ALGO_2)
SRC_STD_LOGGER= \ SRC_STD_EXP_LOGGER= \
std\experimental\logger\core.d \ std\experimental\logger\core.d \
std\experimental\logger\filelogger.d \ std\experimental\logger\filelogger.d \
std\experimental\logger\multilogger.d \ std\experimental\logger\multilogger.d \
std\experimental\logger\nulllogger.d \ std\experimental\logger\nulllogger.d \
std\experimental\logger\package.d std\experimental\logger\package.d
SRC_STD_ALLOC_BB= \ SRC_STD_EXP_ALLOC_BB= \
std\experimental\allocator\building_blocks\affix_allocator.d \ std\experimental\allocator\building_blocks\affix_allocator.d \
std\experimental\allocator\building_blocks\allocator_list.d \ std\experimental\allocator\building_blocks\allocator_list.d \
std\experimental\allocator\building_blocks\bitmapped_block.d \ std\experimental\allocator\building_blocks\bitmapped_block.d \
@ -219,7 +218,7 @@ SRC_STD_ALLOC_BB= \
std\experimental\allocator\building_blocks\stats_collector.d \ std\experimental\allocator\building_blocks\stats_collector.d \
std\experimental\allocator\building_blocks\package.d std\experimental\allocator\building_blocks\package.d
SRC_STD_ALLOC= \ SRC_STD_EXP_ALLOC= \
std\experimental\allocator\common.d \ std\experimental\allocator\common.d \
std\experimental\allocator\gc_allocator.d \ std\experimental\allocator\gc_allocator.d \
std\experimental\allocator\mallocator.d \ std\experimental\allocator\mallocator.d \
@ -227,7 +226,7 @@ SRC_STD_ALLOC= \
std\experimental\allocator\showcase.d \ std\experimental\allocator\showcase.d \
std\experimental\allocator\typed.d \ std\experimental\allocator\typed.d \
std\experimental\allocator\package.d \ std\experimental\allocator\package.d \
$(SRC_STD_ALLOC_BB) $(SRC_STD_EXP_ALLOC_BB)
SRC_STD_5a=$(SRC_STD_ALGO_1) SRC_STD_5a=$(SRC_STD_ALGO_1)
SRC_STD_5b=$(SRC_STD_ALGO_2) SRC_STD_5b=$(SRC_STD_ALGO_2)
@ -249,11 +248,11 @@ SRC_STD_7= \
std\process.d std\process.d
SRC_STD_9= \ SRC_STD_9= \
$(SRC_STD_ALLOC) $(SRC_STD_EXP_ALLOC)
SRC_STD_ALL= \ SRC_STD_ALL= \
$(SRC_STD_1_HEAVY) \ $(SRC_STD_1) \
$(SRC_STD_2a_HEAVY) \ $(SRC_STD_2a) \
$(SRC_STD_math) \ $(SRC_STD_math) \
$(SRC_STD_3) \ $(SRC_STD_3) \
$(SRC_STD_3a) \ $(SRC_STD_3a) \
@ -270,7 +269,7 @@ SRC_STD_ALL= \
$(SRC_STD_6i) \ $(SRC_STD_6i) \
$(SRC_STD_6j) \ $(SRC_STD_6j) \
$(SRC_STD_7) \ $(SRC_STD_7) \
$(SRC_STD_LOGGER) \ $(SRC_STD_EXP_LOGGER) \
$(SRC_STD_9) $(SRC_STD_9)
SRC= \ SRC= \
@ -345,7 +344,7 @@ SRC_STD_RANGE= \
std\range\primitives.d \ std\range\primitives.d \
std\range\interfaces.d std\range\interfaces.d
SRC_STD_NDSLICE= \ SRC_STD_EXP_NDSLICE= \
std\experimental\ndslice\package.d \ std\experimental\ndslice\package.d \
std\experimental\ndslice\iteration.d \ std\experimental\ndslice\iteration.d \
std\experimental\ndslice\selection.d \ std\experimental\ndslice\selection.d \
@ -429,14 +428,14 @@ SRC_ETC_C= \
etc\c\odbc\sqltypes.d \ etc\c\odbc\sqltypes.d \
etc\c\odbc\sqlucode.d etc\c\odbc\sqlucode.d
SRC_EXPERIMENTAL= \ SRC_STD_EXP= \
std\experimental\typecons.d std\experimental\typecons.d
SRC_TO_COMPILE= \ SRC_TO_COMPILE= \
$(SRC_STD_ALL) \ $(SRC_STD_ALL) \
$(SRC_STD_ALGO) \ $(SRC_STD_ALGO) \
$(SRC_STD_RANGE) \ $(SRC_STD_RANGE) \
$(SRC_STD_NDSLICE) \ $(SRC_STD_EXP_NDSLICE) \
$(SRC_STD_REGEX) \ $(SRC_STD_REGEX) \
$(SRC_STD_NET) \ $(SRC_STD_NET) \
$(SRC_STD_C) \ $(SRC_STD_C) \
@ -448,7 +447,7 @@ SRC_TO_COMPILE= \
$(SRC_STD_INTERNAL_WINDOWS) \ $(SRC_STD_INTERNAL_WINDOWS) \
$(SRC_ETC) \ $(SRC_ETC) \
$(SRC_ETC_C) \ $(SRC_ETC_C) \
$(SRC_EXPERIMENTAL) $(SRC_STD_EXP)
SRC_ZLIB= \ SRC_ZLIB= \
etc\c\zlib\crc32.h \ etc\c\zlib\crc32.h \
@ -672,10 +671,10 @@ UNITTEST_OBJS= \
unittest9.obj unittest9.obj
unittest : $(LIB) unittest : $(LIB)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest1.obj $(SRC_STD_1_HEAVY) $(DMD) $(UDFLAGS) -c -unittest -ofunittest1.obj $(SRC_STD_1)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest2.obj $(SRC_STD_RANGE) $(DMD) $(UDFLAGS) -c -unittest -ofunittest2.obj $(SRC_STD_RANGE)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest2.obj $(SRC_STD_NDSLICE) $(DMD) $(UDFLAGS) -c -unittest -ofunittest2.obj $(SRC_STD_EXP_NDSLICE)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest2a.obj $(SRC_STD_2a_HEAVY) $(DMD) $(UDFLAGS) -c -unittest -ofunittest2a.obj $(SRC_STD_2a)
$(DMD) $(UDFLAGS) -c -unittest -ofunittestM.obj $(SRC_STD_math) $(DMD) $(UDFLAGS) -c -unittest -ofunittestM.obj $(SRC_STD_math)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest3.obj $(SRC_STD_3) $(DMD) $(UDFLAGS) -c -unittest -ofunittest3.obj $(SRC_STD_3)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest3a.obj $(SRC_STD_3a) $(DMD) $(UDFLAGS) -c -unittest -ofunittest3a.obj $(SRC_STD_3a)
@ -693,13 +692,13 @@ unittest : $(LIB)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest6h.obj $(SRC_STD_6h) $(DMD) $(UDFLAGS) -c -unittest -ofunittest6h.obj $(SRC_STD_6h)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest6i.obj $(SRC_STD_6i) $(DMD) $(UDFLAGS) -c -unittest -ofunittest6i.obj $(SRC_STD_6i)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest6j.obj $(SRC_STD_6j) $(DMD) $(UDFLAGS) -c -unittest -ofunittest6j.obj $(SRC_STD_6j)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest7.obj $(SRC_STD_7) $(SRC_STD_LOGGER) $(DMD) $(UDFLAGS) -c -unittest -ofunittest7.obj $(SRC_STD_7) $(SRC_STD_EXP_LOGGER)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest8a.obj $(SRC_STD_REGEX) $(DMD) $(UDFLAGS) -c -unittest -ofunittest8a.obj $(SRC_STD_REGEX)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest8b.obj $(SRC_STD_NET) $(DMD) $(UDFLAGS) -c -unittest -ofunittest8b.obj $(SRC_STD_NET)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest8c.obj $(SRC_STD_C) $(SRC_STD_WIN) $(SRC_STD_C_WIN) $(DMD) $(UDFLAGS) -c -unittest -ofunittest8c.obj $(SRC_STD_C) $(SRC_STD_WIN) $(SRC_STD_C_WIN)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest8d.obj $(SRC_STD_INTERNAL) $(SRC_STD_INTERNAL_DIGEST) $(SRC_STD_INTERNAL_MATH) $(SRC_STD_INTERNAL_WINDOWS) $(DMD) $(UDFLAGS) -c -unittest -ofunittest8d.obj $(SRC_STD_INTERNAL) $(SRC_STD_INTERNAL_DIGEST) $(SRC_STD_INTERNAL_MATH) $(SRC_STD_INTERNAL_WINDOWS)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest8e.obj $(SRC_ETC) $(SRC_ETC_C) $(DMD) $(UDFLAGS) -c -unittest -ofunittest8e.obj $(SRC_ETC) $(SRC_ETC_C)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest8f.obj $(SRC_EXPERIMENTAL) $(DMD) $(UDFLAGS) -c -unittest -ofunittest8f.obj $(SRC_STD_EXP)
$(DMD) $(UDFLAGS) -c -unittest -ofunittest9.obj $(SRC_STD_9) $(DMD) $(UDFLAGS) -c -unittest -ofunittest9.obj $(SRC_STD_9)
$(DMD) $(UDFLAGS) -L/OPT:NOICF -unittest unittest.d $(UNITTEST_OBJS) \ $(DMD) $(UDFLAGS) -L/OPT:NOICF -unittest unittest.d $(UNITTEST_OBJS) \
$(ZLIB) $(DRUNTIMELIB) $(ZLIB) $(DRUNTIMELIB)