vm: change "profiler" names to "counting_profiler"

[factor.git] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index 43fba15c0b78b6296853e9567574a82ccfecd976..c48e3a363e5a7fce5feb07ad3a15654f0c7b0f5b 100755 (executable)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,8 +1,6 @@
 ifdef CONFIG
        CC = gcc
        CPP = g++
-       AR = ar
-       LD = ld
 
        VERSION = 0.94
 
@@ -58,14 +56,14 @@ ifdef CONFIG
                vm/object_start_map.o \
                vm/objects.o \
                vm/primitives.o \
-               vm/profiler.o \
+               vm/counting_profiler.o \
                vm/quotations.o \
                vm/run.o \
                vm/strings.o \
                vm/to_tenured_collector.o \
                vm/tuples.o \
                vm/utilities.o \
-               vm/vm.o \
+               vm/vm.o \
                vm/words.o
 
        EXE_OBJS = $(PLAF_EXE_OBJS)
@@ -85,7 +83,8 @@ help:
        @echo "freebsd-x86-64"
        @echo "linux-x86-32"
        @echo "linux-x86-64"
-       @echo "linux-ppc"
+       @echo "linux-ppc-32"
+       @echo "linux-ppc-64"
        @echo "linux-arm"
        @echo "openbsd-x86-32"
        @echo "openbsd-x86-64"
@@ -96,8 +95,8 @@ help:
        @echo "macosx-ppc"
        @echo "solaris-x86-32"
        @echo "solaris-x86-64"
-       @echo "winnt-x86-32"
-       @echo "winnt-x86-64"
+       @echo "windows-x86-32"
+       @echo "windows-x86-64"
        @echo ""
        @echo "Additional modifiers:"
        @echo ""
@@ -141,8 +140,11 @@ linux-x86-32:
 linux-x86-64:
        $(MAKE) $(ALL) CONFIG=vm/Config.linux.x86.64
 
-linux-ppc:
-       $(MAKE) $(ALL) CONFIG=vm/Config.linux.ppc
+linux-ppc-32:
+       $(MAKE) $(ALL) CONFIG=vm/Config.linux.ppc.32
+
+linux-ppc-64:
+       $(MAKE) $(ALL) CONFIG=vm/Config.linux.ppc.64
 
 linux-arm:
        $(MAKE) $(ALL) CONFIG=vm/Config.linux.arm
@@ -153,11 +155,11 @@ solaris-x86-32:
 solaris-x86-64:
        $(MAKE) $(ALL) CONFIG=vm/Config.solaris.x86.64
 
-winnt-x86-32:
+windows-x86-32:
        $(MAKE) $(ALL) CONFIG=vm/Config.windows.x86.32
        $(MAKE) factor-console CONFIG=vm/Config.windows.x86.32
 
-winnt-x86-64:
+windows-x86-64:
        $(MAKE) $(ALL) CONFIG=vm/Config.windows.x86.64
        $(MAKE) factor-console CONFIG=vm/Config.windows.x86.64
 
@@ -175,12 +177,12 @@ $(ENGINE): $(DLL_OBJS)
 factor-lib: $(ENGINE)
 
 factor: $(EXE_OBJS) $(DLL_OBJS)
-       $(TOOLCHAIN_PREFIX)$(CPP) $(LIBS) $(LIBPATH) -L. $(DLL_OBJS) \
-               $(CFLAGS) -o $(EXECUTABLE) $(EXE_OBJS)
+       $(TOOLCHAIN_PREFIX)$(CPP) $(LIBPATH) -L. $(DLL_OBJS) \
+               $(CFLAGS) -o $(EXECUTABLE) $(LIBS) $(EXE_OBJS)
 
 factor-console: $(EXE_OBJS) $(DLL_OBJS)
-       $(TOOLCHAIN_PREFIX)$(CPP) $(LIBS) $(LIBPATH) -L. $(DLL_OBJS) \
-               $(CFLAGS) $(CFLAGS_CONSOLE) -o $(CONSOLE_EXECUTABLE) $(EXE_OBJS)
+       $(TOOLCHAIN_PREFIX)$(CPP) $(LIBPATH) -L. $(DLL_OBJS) \
+               $(CFLAGS) $(CFLAGS_CONSOLE) -o $(CONSOLE_EXECUTABLE) $(LIBS) $(EXE_OBJS)
 
 factor-ffi-test: $(FFI_TEST_LIBRARY)
 
@@ -197,7 +199,7 @@ vm/ffi_test.o: vm/ffi_test.c
        $(TOOLCHAIN_PREFIX)$(CPP) -c $(CFLAGS) -o $@ $<
 
 .S.o:
-       $(TOOLCHAIN_PREFIX)$(CC) -x assembler-with-cpp -c $(CFLAGS) -o $@ $<
+       $(TOOLCHAIN_PREFIX)$(CC) -c $(CFLAGS) -o $@ $<
 
 .mm.o:
        $(TOOLCHAIN_PREFIX)$(CPP) -c $(CFLAGS) -o $@ $<