Build system cleanup...

diff --git a/build/template/unix/template.mk b/build/template/unix/template.mk
new file mode 100644 (file)
index 0000000..fa7ec16
--- /dev/null
+++ b/build/template/unix/template.mk
@@ -0,0 +1,38 @@
+TEMPLATE_SRCDIR = $(ROOT_DIR)/robject
+TEMPLATE_LIB = $(OUTDIR)/librobject.a
+TEMPLATE_SO = $(OUTDIR)/librobject.so.1.0
+
+TEMPLATE_OBJECTS =     \
+       $(OUTDIR)/robject.o \
+
+
+ifeq ($(OS), linux)
+all: $(OUTDIR) $(TEMPLATE_LIB) $(TEMPLATE_SO)
+else
+all: $(OUTDIR) $(TEMPLATE_LIB)
+endif
+
+
+$(OUTDIR)/%.o: $(TEMPLATE_SRCDIR)/%.c
+       $(CC) $(CFLAGS) -o $(OUTDIR)/$*.o -c $(TEMPLATE_SRCDIR)/$*.c
+
+$(TEMPLATE_LIB): $(TEMPLATE_OBJECTS)
+       $(AR) -cr $@ $^
+
+$(TEMPLATE_SO): $(TEMPLATE_OBJECTS)
+       $(CC) $(LDFLAGS) -shared -Wl,-soname,librobject.so -o $@ $^
+
+$(OUTDIR):
+       @mkdir $(OUTDIR)
+
+distclean: clean
+       -rm -f .depend
+       -rm -rf $(OUTDIR)
+
+clean:
+       -rm -f $(TEMPLATE_LIB)
+       -rm -f $(TEMPLATE_SO)
+       -rm -f $(TEMPLATE_OBJECTS)
+       -rm -f *~
+       -rm -f $(ROOT_DIR)/*~
+

diff --git a/build/template/unix/x86_64/Makefile b/build/template/unix/x86_64/Makefile
index 3b98a50..210dccf 100644 (file)
--- a/build/template/unix/x86_64/Makefile
+++ b/build/template/unix/x86_64/Makefile
@@ -1,10 +1,10 @@
-SRCDIR = ../../..
+ROOT_DIR = ../../..
 ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/unix/$(ARCHDIR)
+INCLUDE = -I$(ROOT_DIR)/arch/unix/$(ARCHDIR)
 
-include $(SRCDIR)/build/unix/config.mk
+include $(ROOT_DIR)/build/unix/config.mk
 
 ifeq ($(BLDCFG), release)
 CFLAGS := -fPIC -O3
@@ -19,5 +19,4 @@ endif
 CFLAGS += $(MACH) $(INCLUDE)
 LDFLAGS := $(MACH)
 
-
-include ../robject.mk
+include ../template.mk

diff --git a/build/unix/build.mk b/build/unix/build.mk
index 99c966d..f2ca3a6 100644 (file)
--- a/build/unix/build.mk
+++ b/build/unix/build.mk
@@ -1,36 +1,36 @@
 all:
-       +make -C $(SRCDIR)/rlib/build/unix/$(ARCHDIR) all
-       +make -C $(SRCDIR)/rpa/build/unix/$(ARCHDIR) all
-       +make -C $(SRCDIR)/rvm/build/unix/$(ARCHDIR) all
-       +make -C $(SRCDIR)/rgrep/build/unix/$(ARCHDIR) all
-       +make -C $(SRCDIR)/tests/testmisc/build/unix/$(ARCHDIR) all
-       +make -C $(SRCDIR)/tests/testrpa/build/unix/$(ARCHDIR) all
-       +make -C $(SRCDIR)/rjs/build/unix/$(ARCHDIR) all
+       +make -C $(ROOT_DIR)/rlib/build/unix/$(ARCHDIR) all
+       +make -C $(ROOT_DIR)/rpa/build/unix/$(ARCHDIR) all
+       +make -C $(ROOT_DIR)/rvm/build/unix/$(ARCHDIR) all
+       +make -C $(ROOT_DIR)/rgrep/build/unix/$(ARCHDIR) all
+       +make -C $(ROOT_DIR)/tests/testmisc/build/unix/$(ARCHDIR) all
+       +make -C $(ROOT_DIR)/tests/testrpa/build/unix/$(ARCHDIR) all
+       +make -C $(ROOT_DIR)/rjs/build/unix/$(ARCHDIR) all
 ifeq ($(OS), linux)
-       +make -C $(SRCDIR)/tests/testrjs/build/unix/$(ARCHDIR) all
+       +make -C $(ROOT_DIR)/tests/testrjs/build/unix/$(ARCHDIR) all
 endif
 
 distclean: clean
-       +make -C $(SRCDIR)/rlib/build/unix/$(ARCHDIR) distclean
-       +make -C $(SRCDIR)/rpa/build/unix/$(ARCHDIR) distclean
-       +make -C $(SRCDIR)/rvm/build/unix/$(ARCHDIR) distclean
-       +make -C $(SRCDIR)/rjs/build/unix/$(ARCHDIR) distclean
-       +make -C $(SRCDIR)/tests/testmisc/build/unix/$(ARCHDIR) distclean
-       +make -C $(SRCDIR)/tests/testrpa/build/unix/$(ARCHDIR) distclean
-       +make -C $(SRCDIR)/tests/testrjs/build/unix/$(ARCHDIR) distclean
-       +make -C $(SRCDIR)/rgrep/build/unix/$(ARCHDIR) distclean
-       +make -C $(SRCDIR)/rjs/build/unix/$(ARCHDIR) distclean
+       +make -C $(ROOT_DIR)/rlib/build/unix/$(ARCHDIR) distclean
+       +make -C $(ROOT_DIR)/rpa/build/unix/$(ARCHDIR) distclean
+       +make -C $(ROOT_DIR)/rvm/build/unix/$(ARCHDIR) distclean
+       +make -C $(ROOT_DIR)/rjs/build/unix/$(ARCHDIR) distclean
+       +make -C $(ROOT_DIR)/tests/testmisc/build/unix/$(ARCHDIR) distclean
+       +make -C $(ROOT_DIR)/tests/testrpa/build/unix/$(ARCHDIR) distclean
+       +make -C $(ROOT_DIR)/tests/testrjs/build/unix/$(ARCHDIR) distclean
+       +make -C $(ROOT_DIR)/rgrep/build/unix/$(ARCHDIR) distclean
+       +make -C $(ROOT_DIR)/rjs/build/unix/$(ARCHDIR) distclean
 
 
 clean:
-       +make -C $(SRCDIR)/rlib/build/unix/$(ARCHDIR) clean
-       +make -C $(SRCDIR)/rpa/build/unix/$(ARCHDIR) clean
-       +make -C $(SRCDIR)/rvm/build/unix/$(ARCHDIR) clean
-       +make -C $(SRCDIR)/tests/testmisc/build/unix/$(ARCHDIR) clean
-       +make -C $(SRCDIR)/tests/testrpa/build/unix/$(ARCHDIR) clean
-       +make -C $(SRCDIR)/tests/testrjs/build/unix/$(ARCHDIR) clean
-       +make -C $(SRCDIR)/rgrep/build/unix/$(ARCHDIR) clean
-       +make -C $(SRCDIR)/rjs/build/unix/$(ARCHDIR) clean
+       +make -C $(ROOT_DIR)/rlib/build/unix/$(ARCHDIR) clean
+       +make -C $(ROOT_DIR)/rpa/build/unix/$(ARCHDIR) clean
+       +make -C $(ROOT_DIR)/rvm/build/unix/$(ARCHDIR) clean
+       +make -C $(ROOT_DIR)/tests/testmisc/build/unix/$(ARCHDIR) clean
+       +make -C $(ROOT_DIR)/tests/testrpa/build/unix/$(ARCHDIR) clean
+       +make -C $(ROOT_DIR)/tests/testrjs/build/unix/$(ARCHDIR) clean
+       +make -C $(ROOT_DIR)/rgrep/build/unix/$(ARCHDIR) clean
+       +make -C $(ROOT_DIR)/rjs/build/unix/$(ARCHDIR) clean
 
 
 $(RPATK_INC_INSTALL) :
@@ -46,18 +46,18 @@ $(RPATK_INC_INSTALL)/rpa :
        mkdir $(RPATK_INC_INSTALL)/rpa
 
 install: $(RPATK_INC_INSTALL) $(RPATK_INC_INSTALL)/rlib $(RPATK_INC_INSTALL)/rvm $(RPATK_INC_INSTALL)/rpa
-       cp $(SRCDIR)/arch/unix/$(ARCHDIR)/rtypes.h $(RPATK_INC_INSTALL)
-       +make -C $(SRCDIR)/rlib/build/unix/$(ARCHDIR) install
-       +make -C $(SRCDIR)/rpa/build/unix/$(ARCHDIR) install
-       +make -C $(SRCDIR)/rvm/build/unix/$(ARCHDIR) install
-       +make -C $(SRCDIR)/rgrep/build/unix/$(ARCHDIR) install
+       cp $(ROOT_DIR)/arch/unix/$(ARCHDIR)/rtypes.h $(RPATK_INC_INSTALL)
+       +make -C $(ROOT_DIR)/rlib/build/unix/$(ARCHDIR) install
+       +make -C $(ROOT_DIR)/rpa/build/unix/$(ARCHDIR) install
+       +make -C $(ROOT_DIR)/rvm/build/unix/$(ARCHDIR) install
+       +make -C $(ROOT_DIR)/rgrep/build/unix/$(ARCHDIR) install
        ldconfig -n $(RTK_LIB_INSTALL)
 
 uninstall:
-       +make -C $(SRCDIR)/rlib/build/unix/$(ARCHDIR) uninstall
-       +make -C $(SRCDIR)/rpa/build/unix/$(ARCHDIR) uninstall
-       +make -C $(SRCDIR)/rvm/build/unix/$(ARCHDIR) uninstall
-       +make -C $(SRCDIR)/rgrep/build/unix/$(ARCHDIR) uninstall
+       +make -C $(ROOT_DIR)/rlib/build/unix/$(ARCHDIR) uninstall
+       +make -C $(ROOT_DIR)/rpa/build/unix/$(ARCHDIR) uninstall
+       +make -C $(ROOT_DIR)/rvm/build/unix/$(ARCHDIR) uninstall
+       +make -C $(ROOT_DIR)/rgrep/build/unix/$(ARCHDIR) uninstall
        -rm -rf $(RPATK_INC_INSTALL)/rlib
        -rm -rf $(RPATK_INC_INSTALL)/rvm
        -rm -rf $(RPATK_INC_INSTALL)/rpa

diff --git a/build/unix/config.mk b/build/unix/config.mk
index 75848fe..82e02be 100644 (file)
--- a/build/unix/config.mk
+++ b/build/unix/config.mk
@@ -1,7 +1,10 @@
-PREFIX=
+RTK_LIB_INSTALL=/usr/lib
+RPATK_INC_INSTALL=/usr/include/rpatk
+ARCHDIR = $(shell basename $(shell pwd))
+OS = $(shell uname | tr "[:upper:]" "[:lower:]")
 
-CC = $(PREFIX)gcc
-LD = $(PREFIX)ld
+CC = gcc
+LD = ld
 AR = ar
 CPP = g++
 OC = objcopy

diff --git a/build/unix/i386/Makefile b/build/unix/i386/Makefile
index c72041e..3608ebc 100644 (file)
--- a/build/unix/i386/Makefile
+++ b/build/unix/i386/Makefile
@@ -1,6 +1,2 @@
-SRCDIR = ../../..
-ARCHDIR = $(shell basename $(shell pwd))
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
+include ../x86_64/Makefile
 
-include ../include.mk
-include ../build.mk

diff --git a/build/unix/x86_64/Makefile b/build/unix/x86_64/Makefile
index c72041e..4d8bebc 100644 (file)
--- a/build/unix/x86_64/Makefile
+++ b/build/unix/x86_64/Makefile
@@ -1,6 +1,4 @@
-SRCDIR = ../../..
-ARCHDIR = $(shell basename $(shell pwd))
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
+ROOT_DIR = ../../..
 
-include ../include.mk
+include ../config.mk
 include ../build.mk

diff --git a/rgrep/build/unix/i386/Makefile b/rgrep/build/unix/i386/Makefile
index 0ca0f04..b401d5a 100644 (file)
--- a/rgrep/build/unix/i386/Makefile
+++ b/rgrep/build/unix/i386/Makefile
@@ -1,10 +1,10 @@
 ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-SRCDIR = ../../../..
+ROOT_DIR = ../../../..
 MACH = -m32
 
-include $(SRCDIR)/build/unix/config.mk
+include $(ROOT_DIR)/build/unix/config.mk
 
 CFLAGS = $(MACH)
 ifeq ($(BLDCFG), release)

diff --git a/rgrep/build/unix/rgrep.mk b/rgrep/build/unix/rgrep.mk
index 5afd43b..89df255 100644 (file)
--- a/rgrep/build/unix/rgrep.mk
+++ b/rgrep/build/unix/rgrep.mk
@@ -1,9 +1,9 @@
 RPAGREP_BIN_INSTALL = /usr/bin
-RLIB_SRCDIR = $(SRCDIR)/rlib
-RVM_SRCDIR = $(SRCDIR)/rvm
-RPA_SRCDIR = $(SRCDIR)/rpa
-RGREP_SRCDIR = $(SRCDIR)/rgrep
-INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/arch/unix/$(ARCHDIR) -I$(RGREP_SRCDIR) -I$(RGREP_SRCDIR)/unix
+RLIB_SRCDIR = $(ROOT_DIR)/rlib
+RVM_SRCDIR = $(ROOT_DIR)/rvm
+RPA_SRCDIR = $(ROOT_DIR)/rpa
+RGREP_SRCDIR = $(ROOT_DIR)/rgrep
+INCLUDE = -I$(ROOT_DIR) -I$(ROOT_DIR)/arch/unix/$(ARCHDIR) -I$(RGREP_SRCDIR) -I$(RGREP_SRCDIR)/unix
 ifeq ($(OS), linux)
 LDFLAGS += --static
 endif
@@ -41,7 +41,7 @@ distclean: clean
 clean:
        -rm -f $(TESTS)
        -rm -f *~
-       -rm -f $(SRCDIR)/*~
+       -rm -f $(ROOT_DIR)/*~
        -rm -f $(OBJECTS)
        -rm -f $(OUTDIR)/$(RPAGREP)
 

diff --git a/rgrep/build/unix/x86_64/Makefile b/rgrep/build/unix/x86_64/Makefile
index 06d1c3b..97c092e 100644 (file)
--- a/rgrep/build/unix/x86_64/Makefile
+++ b/rgrep/build/unix/x86_64/Makefile
@@ -1,10 +1,10 @@
 ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-SRCDIR = ../../../..
+ROOT_DIR = ../../../..
 MACH = -m64
 
-include $(SRCDIR)/build/unix/config.mk
+include $(ROOT_DIR)/build/unix/config.mk
 
 CFLAGS = $(MACH)
 ifeq ($(BLDCFG), release)

diff --git a/rjs/build/unix/i386/Makefile b/rjs/build/unix/i386/Makefile
index 52c08d1..d52a94c 100644 (file)
--- a/rjs/build/unix/i386/Makefile
+++ b/rjs/build/unix/i386/Makefile
@@ -1,14 +1,14 @@
-SRCDIR = ../../../..
+ROOT_DIR = ../../../..
 ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/unix/$(ARCHDIR)
+INCLUDE = -I$(ROOT_DIR)/arch/unix/$(ARCHDIR)
 MACH = -m32
 ELFARCH = elf32-i386
 BINARCH = i386
 OCFLAGS_TXT = --input binary --output $(ELFARCH) --binary-architecture $(BINARCH)
 
-include $(SRCDIR)/build/unix/config.mk
+include $(ROOT_DIR)/build/unix/config.mk
 
 ifeq ($(BLDCFG), release)
 CFLAGS := $(MACH) -fPIC -O3

diff --git a/rjs/build/unix/rjs.mk b/rjs/build/unix/rjs.mk
index 8caeacd..0e7b2af 100644 (file)
--- a/rjs/build/unix/rjs.mk
+++ b/rjs/build/unix/rjs.mk
@@ -1,7 +1,7 @@
-RLIB_SRCDIR = $(SRCDIR)/rlib
-RVM_SRCDIR = $(SRCDIR)/rvm
-RPA_SRCDIR = $(SRCDIR)/rpa
-RJS_SRCDIR = $(SRCDIR)/rjs
+RLIB_SRCDIR = $(ROOT_DIR)/rlib
+RVM_SRCDIR = $(ROOT_DIR)/rvm
+RPA_SRCDIR = $(ROOT_DIR)/rpa
+RJS_SRCDIR = $(ROOT_DIR)/rjs
 RJS_LIB = $(OUTDIR)/librjs.a
 RJS_SO = $(OUTDIR)/librjs.so.1.0
 RJS_EXEC = $(OUTDIR)/rjsexec
@@ -14,7 +14,7 @@ ifeq ($(OS), darwin)
 ECMA262_SECTION = -sectcreate rpa ecma262 $(RJS_SRCDIR)/ecma262.rpa
 endif
 
-CFLAGS += -I$(SRCDIR)
+CFLAGS += -I$(ROOT_DIR)
 
 LIBS = -L$(RLIB_SRCDIR)/build/unix/$(ARCHDIR)/out 
 LIBS += -L$(RVM_SRCDIR)/build/unix/$(ARCHDIR)/out 
@@ -107,5 +107,5 @@ clean:
        -rm -f $(RJS_OBJECTS)
        -rm -f $(RJS_EXEC)
        -rm -f *~
-       -rm -f $(SRCDIR)/*~
+       -rm -f $(ROOT_DIR)/*~
 

diff --git a/rjs/build/unix/x86_64/Makefile b/rjs/build/unix/x86_64/Makefile
index 4248f0c..d92bf07 100644 (file)
--- a/rjs/build/unix/x86_64/Makefile
+++ b/rjs/build/unix/x86_64/Makefile
@@ -1,14 +1,14 @@
-SRCDIR = ../../../..
+ROOT_DIR = ../../../..
 ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/unix/$(ARCHDIR)
+INCLUDE = -I$(ROOT_DIR)/arch/unix/$(ARCHDIR)
 MACH = -m64
 ELFARCH = elf64-x86-64
 BINARCH = i386:x86-64
 OCFLAGS_TXT = --input binary --output $(ELFARCH) --binary-architecture $(BINARCH)
 
-include $(SRCDIR)/build/unix/config.mk
+include $(ROOT_DIR)/build/unix/config.mk
 
 ifeq ($(BLDCFG), release)
 CFLAGS := $(MACH) -fPIC -O3

diff --git a/rlib/build/unix/i386/Makefile b/rlib/build/unix/i386/Makefile
index 87d1579..fdb869e 100644 (file)
--- a/rlib/build/unix/i386/Makefile
+++ b/rlib/build/unix/i386/Makefile
@@ -1,12 +1,10 @@
-SRCDIR = ../../../..
-ARCHDIR = $(shell basename $(shell pwd))
+ROOT_DIR = ../../../..
+include $(ROOT_DIR)/build/unix/config.mk
+
+INCLUDE = -I$(ROOT_DIR)/arch/unix/$(ARCHDIR)
 OUTDIR = out
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/unix/$(ARCHDIR)
 MACH = -m32
 
-include $(SRCDIR)/build/unix/config.mk
-
 CFLAGS := $(MACH)
 ifeq ($(BLDCFG), release)
 CFLAGS += -fPIC -O3
@@ -27,5 +25,5 @@ endif
 CFLAGS +=  $(INCLUDE)
 LDFLAGS := $(MACH)
 
-include $(SRCDIR)/build/unix/include.mk
+
 include ../rlib.mk

diff --git a/rlib/build/unix/rlib.mk b/rlib/build/unix/rlib.mk
index 080dfa6..7f774e3 100644 (file)
--- a/rlib/build/unix/rlib.mk
+++ b/rlib/build/unix/rlib.mk
@@ -1,5 +1,5 @@
 RPATK_LIB_INSTALL=/usr/lib
-RLIB_SRCDIR = $(SRCDIR)/rlib
+RLIB_SRCDIR = $(ROOT_DIR)/rlib
 RLIB_SO_VERSION = 2.0
 RLIB_SO_NAME = librlib.so
 RLIB_LIB = librlib.a
@@ -7,7 +7,7 @@ RLIB_SO = $(RLIB_SO_NAME).$(RLIB_SO_VERSION)
 RLIB_LIB = librlib.a
 TARGET_RLIB_LIB = $(OUTDIR)/$(RLIB_LIB)
 TARGET_RLIB_SO = $(OUTDIR)/$(RLIB_SO)
-CFLAGS += -I$(SRCDIR)
+CFLAGS += -I$(ROOT_DIR)
 
 RLIB_OBJECTS +=        $(OUTDIR)/rref.o
 RLIB_OBJECTS +=        $(OUTDIR)/rcharconv.o
@@ -53,7 +53,7 @@ clean:
        @rm -f $(TARGET_RLIB_SO)
        @rm -f $(RLIB_OBJECTS)
        @rm -f *~
-       @rm -f $(SRCDIR)/*~
+       @rm -f $(ROOT_DIR)/*~
 
 install:
        cp $(TARGET_RLIB_SO) $(RPATK_LIB_INSTALL)

diff --git a/rlib/build/unix/x86_64/Makefile b/rlib/build/unix/x86_64/Makefile
index c46e482..c57fc2d 100644 (file)
--- a/rlib/build/unix/x86_64/Makefile
+++ b/rlib/build/unix/x86_64/Makefile
@@ -1,12 +1,10 @@
-SRCDIR = ../../../..
-ARCHDIR = $(shell basename $(shell pwd))
+ROOT_DIR = ../../../..
+include $(ROOT_DIR)/build/unix/config.mk
+
+INCLUDE = -I$(ROOT_DIR)/arch/unix/$(ARCHDIR)
 OUTDIR = out
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/unix/$(ARCHDIR)
 MACH = -m64
 
-include $(SRCDIR)/build/unix/config.mk
-
 CFLAGS := $(MACH)
 ifeq ($(BLDCFG), release)
 CFLAGS += -fPIC -O3
@@ -27,5 +25,4 @@ endif
 CFLAGS +=  $(INCLUDE)
 LDFLAGS := $(MACH)
 
-include $(SRCDIR)/build/unix/include.mk
 include ../rlib.mk

diff --git a/rpa/build/unix/i386/Makefile b/rpa/build/unix/i386/Makefile
index 64ee1d5..06ad98a 100644 (file)
--- a/rpa/build/unix/i386/Makefile
+++ b/rpa/build/unix/i386/Makefile
@@ -1,12 +1,9 @@
-SRCDIR = ../../../..
-ARCHDIR = $(shell basename $(shell pwd))
+ROOT_DIR = ../../../..
+include $(ROOT_DIR)/build/unix/config.mk
+INCLUDE = -I$(ROOT_DIR)/arch/unix/$(ARCHDIR)
 OUTDIR = out
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/unix/$(ARCHDIR)
 MACH = -m32
 
-include $(SRCDIR)/build/unix/config.mk
-
 CFLAGS := $(MACH)
 ifeq ($(BLDCFG), release)
 CFLAGS += -fPIC -O3
@@ -21,5 +18,4 @@ endif
 CFLAGS += $(INCLUDE)
 LDFLAGS := $(MACH)
 
-include $(SRCDIR)/build/unix/include.mk
 include ../rpa.mk

diff --git a/rpa/build/unix/rpa.mk b/rpa/build/unix/rpa.mk
index 404a4a9..bf9c2e9 100644 (file)
--- a/rpa/build/unix/rpa.mk
+++ b/rpa/build/unix/rpa.mk
@@ -1,11 +1,11 @@
-RPA_SRCDIR = $(SRCDIR)/rpa
+RPA_SRCDIR = $(ROOT_DIR)/rpa
 RPA_LIB = librpa.a
 RPA_SO_VERSION = 2.0
 RPA_SO_NAME = librpa.so
 RPA_SO = $(RPA_SO_NAME).$(RPA_SO_VERSION)
 TARGET_RPA_LIB = $(OUTDIR)/$(RPA_LIB)
 TARGET_RPA_SO = $(OUTDIR)/$(RPA_SO)
-CFLAGS += -I$(SRCDIR)
+CFLAGS += -I$(ROOT_DIR)
 
 RPA_OBJECTS += $(OUTDIR)/rpacache.o
 RPA_OBJECTS += $(OUTDIR)/rpadbex.o
@@ -46,7 +46,7 @@ clean:
        -rm -f $(TARGET_RPA_SO)
        -rm -f $(RPA_OBJECTS)
        -rm -f *~
-       -rm -f $(SRCDIR)/*~
+       -rm -f $(ROOT_DIR)/*~
 
 install:
        cp $(TARGET_RPA_SO) $(RTK_LIB_INSTALL)

diff --git a/rpa/build/unix/x86_64/Makefile b/rpa/build/unix/x86_64/Makefile
index b45b790..cb6d397 100644 (file)
--- a/rpa/build/unix/x86_64/Makefile
+++ b/rpa/build/unix/x86_64/Makefile
@@ -1,12 +1,10 @@
-SRCDIR = ../../../..
-ARCHDIR = $(shell basename $(shell pwd))
+ROOT_DIR = ../../../..
+include $(ROOT_DIR)/build/unix/config.mk
+
+INCLUDE = -I$(ROOT_DIR)/arch/unix/$(ARCHDIR)
 OUTDIR = out
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/unix/$(ARCHDIR)
 MACH = -m64
 
-include $(SRCDIR)/build/unix/config.mk
-
 CFLAGS := $(MACH)
 ifeq ($(BLDCFG), release)
 CFLAGS += -fPIC -O3
@@ -21,5 +19,4 @@ endif
 CFLAGS += $(INCLUDE)
 LDFLAGS := $(MACH)
 
-include $(SRCDIR)/build/unix/include.mk
 include ../rpa.mk

diff --git a/rvm/build/unix/i386/Makefile b/rvm/build/unix/i386/Makefile
index 7c6b2ab..a8e53a5 100644 (file)
--- a/rvm/build/unix/i386/Makefile
+++ b/rvm/build/unix/i386/Makefile
@@ -1,12 +1,10 @@
-SRCDIR = ../../../..
-ARCHDIR = $(shell basename $(shell pwd))
+ROOT_DIR = ../../../..
+include $(ROOT_DIR)/build/unix/config.mk
+
+INCLUDE = -I$(ROOT_DIR)/arch/unix/$(ARCHDIR)
 OUTDIR = out
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/unix/$(ARCHDIR)
 MACH = -m32
 
-include $(SRCDIR)/build/unix/config.mk
-
 CFLAGS += $(MACH)
 ifeq ($(BLDCFG), release)
 CFLAGS += -fPIC -O3
@@ -26,5 +24,4 @@ endif
 CFLAGS += $(INCLUDE)
 LDFLAGS := $(MACH)
 
-include $(SRCDIR)/build/unix/include.mk
 include ../rvm.mk

diff --git a/rvm/build/unix/rvm.mk b/rvm/build/unix/rvm.mk
index 5bc2ed1..1d18452 100644 (file)
--- a/rvm/build/unix/rvm.mk
+++ b/rvm/build/unix/rvm.mk
@@ -1,12 +1,12 @@
 RTK_LIB_INSTALL=/usr/lib
-RVM_SRCDIR = $(SRCDIR)/rvm
+RVM_SRCDIR = $(ROOT_DIR)/rvm
 RVM_SO_VERSION = 2.0
 RVM_SO_NAME = librvm.so
 RVM_LIB = librvm.a
 RVM_SO = $(RVM_SO_NAME).$(RVM_SO_VERSION)
 TARGET_RVM_LIB = $(OUTDIR)/$(RVM_LIB)
 TARGET_RVM_SO = $(OUTDIR)/$(RVM_SO)
-CFLAGS += -I$(SRCDIR)
+CFLAGS += -I$(ROOT_DIR)
 
 RVM_OBJECTS += $(OUTDIR)/rvmcpu.o 
 RVM_OBJECTS += $(OUTDIR)/rvmcodemap.o
@@ -43,7 +43,7 @@ clean:
        -rm -f $(TARGET_RVM_SO)
        -rm -f $(RVM_OBJECTS)
        -rm -f *~
-       -rm -f $(SRCDIR)/*~
+       -rm -f $(ROOT_DIR)/*~
 
 install:
        cp $(TARGET_RVM_SO) $(RTK_LIB_INSTALL)

diff --git a/rvm/build/unix/x86_64/Makefile b/rvm/build/unix/x86_64/Makefile
index 5eda609..c1bf0be 100644 (file)
--- a/rvm/build/unix/x86_64/Makefile
+++ b/rvm/build/unix/x86_64/Makefile
@@ -1,12 +1,9 @@
-SRCDIR = ../../../..
-ARCHDIR = $(shell basename $(shell pwd))
+ROOT_DIR = ../../../..
+include $(ROOT_DIR)/build/unix/config.mk
+INCLUDE = -I$(ROOT_DIR)/arch/unix/$(ARCHDIR)
 OUTDIR = out
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/unix/$(ARCHDIR)
 MACH = -m64
 
-include $(SRCDIR)/build/unix/config.mk
-
 CFLAGS += $(MACH)
 ifeq ($(BLDCFG), release)
 CFLAGS += -fPIC -O3
@@ -26,5 +23,4 @@ endif
 CFLAGS += $(INCLUDE)
 LDFLAGS := $(MACH)
 
-include $(SRCDIR)/build/unix/include.mk
 include ../rvm.mk

diff --git a/tests/testmisc/build/unix/i386/Makefile b/tests/testmisc/build/unix/i386/Makefile
index 0a68f37..8160c11 100644 (file)
--- a/tests/testmisc/build/unix/i386/Makefile
+++ b/tests/testmisc/build/unix/i386/Makefile
@@ -1,10 +1,10 @@
 ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-SRCDIR = ../../../../..
+ROOT_DIR = ../../../../..
 MACH = -m32
 
-include $(SRCDIR)/build/unix/config.mk
+include $(ROOT_DIR)/build/unix/config.mk
 
 ifeq ($(BLDCFG), release)
 CFLAGS = -O3

diff --git a/tests/testmisc/build/unix/misc-tests.mk b/tests/testmisc/build/unix/misc-tests.mk
index b59ca20..832e3e0 100644 (file)
--- a/tests/testmisc/build/unix/misc-tests.mk
+++ b/tests/testmisc/build/unix/misc-tests.mk
@@ -1,10 +1,10 @@
-ROBJECT_SRCDIR = $(SRCDIR)/robject
-RLIB_SRCDIR = $(SRCDIR)/rlib
-RVM_SRCDIR = $(SRCDIR)/rvm
-RPA_SRCDIR = $(SRCDIR)/rpa
-RAST_SRCDIR = $(SRCDIR)/rast
-TESTS_SRCDIR = $(SRCDIR)/tests/testmisc
-INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/arch/unix/$(ARCHDIR) -I$(RPA_SRCDIR)
+ROBJECT_SRCDIR = $(ROOT_DIR)/robject
+RLIB_SRCDIR = $(ROOT_DIR)/rlib
+RVM_SRCDIR = $(ROOT_DIR)/rvm
+RPA_SRCDIR = $(ROOT_DIR)/rpa
+RAST_SRCDIR = $(ROOT_DIR)/rast
+TESTS_SRCDIR = $(ROOT_DIR)/tests/testmisc
+INCLUDE = -I$(ROOT_DIR) -I$(ROOT_DIR)/arch/unix/$(ARCHDIR) -I$(RPA_SRCDIR)
 ifeq ($(OS), linux)
 LDFLAGS += --static
 endif
@@ -71,5 +71,5 @@ distclean: clean
 clean:
        -rm -f $(TESTS)
        -rm -f *~
-       -rm -f $(SRCDIR)/*~
+       -rm -f $(ROOT_DIR)/*~
 

diff --git a/tests/testmisc/build/unix/x86_64/Makefile b/tests/testmisc/build/unix/x86_64/Makefile
index 04a5ec7..09c2be2 100644 (file)
--- a/tests/testmisc/build/unix/x86_64/Makefile
+++ b/tests/testmisc/build/unix/x86_64/Makefile
@@ -1,10 +1,10 @@
 ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-SRCDIR = ../../../../..
+ROOT_DIR = ../../../../..
 MACH = -m64
 
-include $(SRCDIR)/build/unix/config.mk
+include $(ROOT_DIR)/build/unix/config.mk
 
 ifeq ($(BLDCFG), release)
 CFLAGS = -O3

diff --git a/tests/testrjs/build/unix/i386/Makefile b/tests/testrjs/build/unix/i386/Makefile
index d03a691..1a8621f 100644 (file)
--- a/tests/testrjs/build/unix/i386/Makefile
+++ b/tests/testrjs/build/unix/i386/Makefile
@@ -1,10 +1,10 @@
 ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-SRCDIR = ../../../../..
+ROOT_DIR = ../../../../..
 MACH = -m32
 
-include $(SRCDIR)/build/unix/config.mk
+include $(ROOT_DIR)/build/unix/config.mk
 
 ifeq ($(BLDCFG), release)
 CFLAGS = -O3

diff --git a/tests/testrjs/build/unix/testrjs.mk b/tests/testrjs/build/unix/testrjs.mk
index 12ea8e3..bba63c6 100644 (file)
--- a/tests/testrjs/build/unix/testrjs.mk
+++ b/tests/testrjs/build/unix/testrjs.mk
@@ -1,10 +1,10 @@
-ROBJECT_SRCDIR = $(SRCDIR)/robject
-RLIB_SRCDIR = $(SRCDIR)/rlib
-RVM_SRCDIR = $(SRCDIR)/rvm
-RPA_SRCDIR = $(SRCDIR)/rpa
-RJS_SRCDIR = $(SRCDIR)/rjs
-TESTS_SRCDIR = $(SRCDIR)/tests/testrjs
-INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/arch/unix/$(ARCHDIR)
+ROBJECT_SRCDIR = $(ROOT_DIR)/robject
+RLIB_SRCDIR = $(ROOT_DIR)/rlib
+RVM_SRCDIR = $(ROOT_DIR)/rvm
+RPA_SRCDIR = $(ROOT_DIR)/rpa
+RJS_SRCDIR = $(ROOT_DIR)/rjs
+TESTS_SRCDIR = $(ROOT_DIR)/tests/testrjs
+INCLUDE = -I$(ROOT_DIR) -I$(ROOT_DIR)/arch/unix/$(ARCHDIR)
 ifeq ($(OS), linux)
 LDFLAGS += --static
 endif
@@ -42,5 +42,5 @@ distclean: clean
 clean:
        -rm -f $(TESTS)
        -rm -f *~
-       -rm -f $(SRCDIR)/*~
+       -rm -f $(ROOT_DIR)/*~
 

diff --git a/tests/testrjs/build/unix/x86_64/Makefile b/tests/testrjs/build/unix/x86_64/Makefile
index a730db2..97bbdbf 100644 (file)
--- a/tests/testrjs/build/unix/x86_64/Makefile
+++ b/tests/testrjs/build/unix/x86_64/Makefile
@@ -1,10 +1,10 @@
 ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-SRCDIR = ../../../../..
+ROOT_DIR = ../../../../..
 MACH = -m64
 
-include $(SRCDIR)/build/unix/config.mk
+include $(ROOT_DIR)/build/unix/config.mk
 
 ifeq ($(BLDCFG), release)
 CFLAGS = -O3

diff --git a/tests/testrpa/build/unix/i386/Makefile b/tests/testrpa/build/unix/i386/Makefile
index d15d643..d19167c 100644 (file)
--- a/tests/testrpa/build/unix/i386/Makefile
+++ b/tests/testrpa/build/unix/i386/Makefile
@@ -1,10 +1,10 @@
 ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-SRCDIR = ../../../../..
+ROOT_DIR = ../../../../..
 MACH = -m32
 
-include $(SRCDIR)/build/unix/config.mk
+include $(ROOT_DIR)/build/unix/config.mk
 
 ifeq ($(BLDCFG), release)
 CFLAGS = -O3

diff --git a/tests/testrpa/build/unix/testrpa2.mk b/tests/testrpa/build/unix/testrpa2.mk
index a494d7f..ef882ba 100644 (file)
--- a/tests/testrpa/build/unix/testrpa2.mk
+++ b/tests/testrpa/build/unix/testrpa2.mk
@@ -1,8 +1,8 @@
-RLIB_SRCDIR = $(SRCDIR)/rlib
-RVM_SRCDIR = $(SRCDIR)/rvm
-RPA_SRCDIR = $(SRCDIR)/rpa
-TESTS_SRCDIR = $(SRCDIR)/tests/testrpa
-INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/arch/unix/$(ARCHDIR)
+RLIB_SRCDIR = $(ROOT_DIR)/rlib
+RVM_SRCDIR = $(ROOT_DIR)/rvm
+RPA_SRCDIR = $(ROOT_DIR)/rpa
+TESTS_SRCDIR = $(ROOT_DIR)/tests/testrpa
+INCLUDE = -I$(ROOT_DIR) -I$(ROOT_DIR)/arch/unix/$(ARCHDIR)
 ifeq ($(OS), linux)
 LDFLAGS += --static
 endif
@@ -51,5 +51,5 @@ distclean: clean
 clean:
        -rm -f $(TESTS)
        -rm -f *~
-       -rm -f $(SRCDIR)/*~
+       -rm -f $(ROOT_DIR)/*~
 

diff --git a/tests/testrpa/build/unix/x86_64/Makefile b/tests/testrpa/build/unix/x86_64/Makefile
index 19cd609..ccc1819 100644 (file)
--- a/tests/testrpa/build/unix/x86_64/Makefile
+++ b/tests/testrpa/build/unix/x86_64/Makefile
@@ -1,10 +1,10 @@
 ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-SRCDIR = ../../../../..
+ROOT_DIR = ../../../../..
 MACH = -m64
 
-include $(SRCDIR)/build/unix/config.mk
+include $(ROOT_DIR)/build/unix/config.mk
 
 ifeq ($(BLDCFG), release)
 CFLAGS = -O3