RPA Toolkit
build changes for unix systems
authorMartin Stoilov <martin@rpasearch.com>
Sat, 30 Jul 2011 04:01:57 +0000 (21:01 -0700)
committerMartin Stoilov <martin@rpasearch.com>
Sat, 30 Jul 2011 04:02:38 +0000 (21:02 -0700)
65 files changed:
arch/darwin/i386/rtypes.h [deleted file]
arch/darwin/x86_64/rtypes.h [deleted file]
arch/unix/i386/rtypes.h [moved from arch/linux/i386/rtypes.h with 100% similarity]
arch/unix/x86_64/rpatypes.h [moved from arch/linux/x86_64/rpatypes.h with 100% similarity]
arch/unix/x86_64/rtypes.h [moved from arch/linux/x86_64/rtypes.h with 100% similarity]
build/darwin/build.mk [deleted file]
build/linux/build.mk [deleted file]
build/linux/i386/Makefile [deleted file]
build/linux/include.mk [deleted file]
build/linux/x86_64/Makefile [deleted file]
build/template/unix/robject.mk [moved from build/template/linux/robject.mk with 100% similarity]
build/template/unix/x86_64/Makefile [moved from build/template/linux/x86_64/Makefile with 89% similarity]
build/unix/build.mk [new file with mode: 0644]
build/unix/i386/Makefile [moved from build/darwin/i386/Makefile with 100% similarity]
build/unix/include.mk [moved from build/darwin/include.mk with 100% similarity]
build/unix/x86_64/Makefile [moved from build/darwin/x86_64/Makefile with 100% similarity]
phpext/prpa/config.m4
rgrep/build/darwin/rgrep.mk [deleted file]
rgrep/build/linux/i386/Makefile [deleted file]
rgrep/build/linux/x86_64/Makefile [deleted file]
rgrep/build/unix/i386/Makefile [moved from rgrep/build/darwin/i386/Makefile with 100% similarity]
rgrep/build/unix/rgrep.mk [moved from rgrep/build/linux/rgrep.mk with 79% similarity]
rgrep/build/unix/x86_64/Makefile [moved from rgrep/build/darwin/x86_64/Makefile with 100% similarity]
rjs/build/darwin/i386/Makefile [deleted file]
rjs/build/darwin/rjs.mk [deleted file]
rjs/build/darwin/x86_64/Makefile [deleted file]
rjs/build/unix/i386/Makefile [moved from rjs/build/linux/i386/Makefile with 92% similarity]
rjs/build/unix/rjs.mk [moved from rjs/build/linux/rjs.mk with 86% similarity]
rjs/build/unix/x86_64/Makefile [moved from rjs/build/linux/x86_64/Makefile with 92% similarity]
rlib/build/darwin/i386/Makefile [deleted file]
rlib/build/darwin/rlib.mk [deleted file]
rlib/build/linux/x86_64/Makefile [deleted file]
rlib/build/unix/i386/Makefile [moved from rlib/build/linux/i386/Makefile with 86% similarity]
rlib/build/unix/rlib.mk [moved from rlib/build/linux/rlib.mk with 100% similarity]
rlib/build/unix/x86_64/Makefile [moved from rlib/build/darwin/x86_64/Makefile with 86% similarity]
rpa/build/darwin/rpa.mk [deleted file]
rpa/build/darwin/x86_64/Makefile [deleted file]
rpa/build/linux/i386/Makefile [deleted file]
rpa/build/unix/i386/Makefile [moved from rpa/build/darwin/i386/Makefile with 82% similarity]
rpa/build/unix/rpa.mk [moved from rpa/build/linux/rpa.mk with 100% similarity]
rpa/build/unix/x86_64/Makefile [moved from rpa/build/linux/x86_64/Makefile with 82% similarity]
rvm/build/darwin/i386/Makefile [deleted file]
rvm/build/darwin/rvm.mk [deleted file]
rvm/build/linux/x86_64/Makefile [deleted file]
rvm/build/unix/i386/Makefile [moved from rvm/build/linux/i386/Makefile with 84% similarity]
rvm/build/unix/rvm.mk [moved from rvm/build/linux/rvm.mk with 100% similarity]
rvm/build/unix/x86_64/Makefile [moved from rvm/build/darwin/x86_64/Makefile with 84% similarity]
tests/testmisc/build/darwin/misc-tests.mk [deleted file]
tests/testmisc/build/linux/i386/Makefile [deleted file]
tests/testmisc/build/linux/x86_64/Makefile [deleted file]
tests/testmisc/build/unix/i386/Makefile [moved from tests/testmisc/build/darwin/i386/Makefile with 100% similarity]
tests/testmisc/build/unix/misc-tests.mk [moved from tests/testmisc/build/linux/misc-tests.mk with 85% similarity]
tests/testmisc/build/unix/x86_64/Makefile [moved from tests/testmisc/build/darwin/x86_64/Makefile with 100% similarity]
tests/testrjs/build/darwin/testrjs.mk [deleted file]
tests/testrjs/build/linux/i386/Makefile [deleted file]
tests/testrjs/build/linux/x86_64/Makefile [deleted file]
tests/testrjs/build/unix/i386/Makefile [moved from tests/testrjs/build/darwin/i386/Makefile with 100% similarity]
tests/testrjs/build/unix/testrjs.mk [moved from tests/testrjs/build/linux/testrjs.mk with 68% similarity]
tests/testrjs/build/unix/x86_64/Makefile [moved from tests/testrjs/build/darwin/x86_64/Makefile with 100% similarity]
tests/testrpa/build/darwin/testrpa2.mk [deleted file]
tests/testrpa/build/linux/i386/Makefile [deleted file]
tests/testrpa/build/linux/x86_64/Makefile [deleted file]
tests/testrpa/build/unix/i386/Makefile [moved from tests/testrpa/build/darwin/i386/Makefile with 100% similarity]
tests/testrpa/build/unix/testrpa2.mk [moved from tests/testrpa/build/linux/testrpa2.mk with 84% similarity]
tests/testrpa/build/unix/x86_64/Makefile [moved from tests/testrpa/build/darwin/x86_64/Makefile with 100% similarity]

diff --git a/arch/darwin/i386/rtypes.h b/arch/darwin/i386/rtypes.h
deleted file mode 100644 (file)
index 132adaa..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-#ifndef _RTYPES_H_
-#define _RTYPES_H_
-
-/* 
- * Architecture dependent types. These types have to be redefined
- * for every architecture
- */
-typedef signed char rint8;
-typedef unsigned char ruint8;
-typedef signed short rint16;
-typedef unsigned short ruint16;
-typedef signed int rint32;
-typedef unsigned int ruint32;
-typedef signed long long rint64;
-typedef unsigned long long ruint64;
-typedef unsigned int ratomic_t;
-typedef unsigned long ruword;
-typedef long rword;
-
-/*
- * Common types. These types should be the same for most of the architectures.
- */
-typedef int rboolean;
-typedef void *rpointer;
-typedef const void *rconstpointer;
-typedef struct {ruint32 p1; ruint32 p2;} rpair_t;
-
-/*
- * Atomic operations (Architecture Dependent)
- */
-#define R_ATOMIC_CMPXCHG(ptr, oldval, newval, resptr) \
-               do { __asm__ __volatile__ ("lock; cmpxchgl %2, %1" \
-                       : "=a" (*(resptr)), "=m" (*ptr) \
-                       : "r" (newval), "m" (*ptr), "0" (oldval)); } while (0)
-
-#define R_ATOMIC_XCHG(ptr, val) \
-               do { __asm__ __volatile__("lock; xchgl %0,%1" \
-                       :"=r" ((ruint32) val) \
-                       :"m" (*(volatile ruint32 *)ptr), "0" (val) \
-                       :"memory"); } while (0)
-
-#define R_ATOMIC_ADD(ptr, val) \
-               do { __asm__ __volatile__ ("addl %1,%0" \
-                       : "=m" (*ptr) \
-                       : "ir" (val), "m" (*ptr)); } while (0)
-
-#define R_ATOMIC_SUB(ptr, val) \
-               do { __asm__ __volatile__ ("subl %1,%0" \
-                       : "=m" (*ptr) \
-                       : "ir" (val), "m" (*ptr)); } while (0)
-
-
-#define R_DEBUG_BRAKE __asm__ ("int $3")
-#define R_ASSERT(__a__) do {if (!(__a__)) R_DEBUG_BRAKE; } while (0)
-#define R_SIZE_ALIGN(s, n) ((((s) + (n) - 1) / (n)) * (n))
-#define R_MIN(a, b) ((a) < (b) ? (a): (b))
-#define R_MAX(a, b) ((a) > (b) ? (a): (b))
-
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((rpointer)0)
-#endif
-#endif
-
-#ifndef TRUE
-#define TRUE ((rboolean)1)
-#endif
-
-#ifndef FALSE
-#define FALSE ((rboolean)0)
-#endif
-
-
-typedef enum {
-       RVALSET_NONE = 0,
-       RVALSET_OR,
-       RVALSET_XOR,
-       RVALSET_AND,
-} rvalset_t;
-
-
-#endif
-
diff --git a/arch/darwin/x86_64/rtypes.h b/arch/darwin/x86_64/rtypes.h
deleted file mode 100644 (file)
index 132adaa..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-#ifndef _RTYPES_H_
-#define _RTYPES_H_
-
-/* 
- * Architecture dependent types. These types have to be redefined
- * for every architecture
- */
-typedef signed char rint8;
-typedef unsigned char ruint8;
-typedef signed short rint16;
-typedef unsigned short ruint16;
-typedef signed int rint32;
-typedef unsigned int ruint32;
-typedef signed long long rint64;
-typedef unsigned long long ruint64;
-typedef unsigned int ratomic_t;
-typedef unsigned long ruword;
-typedef long rword;
-
-/*
- * Common types. These types should be the same for most of the architectures.
- */
-typedef int rboolean;
-typedef void *rpointer;
-typedef const void *rconstpointer;
-typedef struct {ruint32 p1; ruint32 p2;} rpair_t;
-
-/*
- * Atomic operations (Architecture Dependent)
- */
-#define R_ATOMIC_CMPXCHG(ptr, oldval, newval, resptr) \
-               do { __asm__ __volatile__ ("lock; cmpxchgl %2, %1" \
-                       : "=a" (*(resptr)), "=m" (*ptr) \
-                       : "r" (newval), "m" (*ptr), "0" (oldval)); } while (0)
-
-#define R_ATOMIC_XCHG(ptr, val) \
-               do { __asm__ __volatile__("lock; xchgl %0,%1" \
-                       :"=r" ((ruint32) val) \
-                       :"m" (*(volatile ruint32 *)ptr), "0" (val) \
-                       :"memory"); } while (0)
-
-#define R_ATOMIC_ADD(ptr, val) \
-               do { __asm__ __volatile__ ("addl %1,%0" \
-                       : "=m" (*ptr) \
-                       : "ir" (val), "m" (*ptr)); } while (0)
-
-#define R_ATOMIC_SUB(ptr, val) \
-               do { __asm__ __volatile__ ("subl %1,%0" \
-                       : "=m" (*ptr) \
-                       : "ir" (val), "m" (*ptr)); } while (0)
-
-
-#define R_DEBUG_BRAKE __asm__ ("int $3")
-#define R_ASSERT(__a__) do {if (!(__a__)) R_DEBUG_BRAKE; } while (0)
-#define R_SIZE_ALIGN(s, n) ((((s) + (n) - 1) / (n)) * (n))
-#define R_MIN(a, b) ((a) < (b) ? (a): (b))
-#define R_MAX(a, b) ((a) > (b) ? (a): (b))
-
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((rpointer)0)
-#endif
-#endif
-
-#ifndef TRUE
-#define TRUE ((rboolean)1)
-#endif
-
-#ifndef FALSE
-#define FALSE ((rboolean)0)
-#endif
-
-
-typedef enum {
-       RVALSET_NONE = 0,
-       RVALSET_OR,
-       RVALSET_XOR,
-       RVALSET_AND,
-} rvalset_t;
-
-
-#endif
-
diff --git a/build/darwin/build.mk b/build/darwin/build.mk
deleted file mode 100644 (file)
index 03492c2..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-all:
-       +make -C $(SRCDIR)/rlib/build/$(OS)/$(ARCHDIR) all
-       +make -C $(SRCDIR)/rpa/build/$(OS)/$(ARCHDIR) all
-       +make -C $(SRCDIR)/rvm/build/$(OS)/$(ARCHDIR) all
-       +make -C $(SRCDIR)/tests/testmisc/build/$(OS)/$(ARCHDIR) all
-       +make -C $(SRCDIR)/tests/testrpa/build/$(OS)/$(ARCHDIR) all
-       +make -C $(SRCDIR)/rgrep/build/$(OS)/$(ARCHDIR) all
-
-distclean: clean
-       +make -C $(SRCDIR)/rlib/build/$(OS)/$(ARCHDIR) distclean
-       +make -C $(SRCDIR)/rpa/build/$(OS)/$(ARCHDIR) distclean
-       +make -C $(SRCDIR)/rvm/build/$(OS)/$(ARCHDIR) distclean
-       +make -C $(SRCDIR)/tests/testmisc/build/$(OS)/$(ARCHDIR) distclean
-       +make -C $(SRCDIR)/tests/testrpa/build/$(OS)/$(ARCHDIR) distclean
-       +make -C $(SRCDIR)/rgrep/build/$(OS)/$(ARCHDIR) distclean
-
-clean:
-       +make -C $(SRCDIR)/rlib/build/$(OS)/$(ARCHDIR) clean
-       +make -C $(SRCDIR)/rpa/build/$(OS)/$(ARCHDIR) clean
-       +make -C $(SRCDIR)/rvm/build/$(OS)/$(ARCHDIR) clean
-       +make -C $(SRCDIR)/tests/testmisc/build/$(OS)/$(ARCHDIR) clean
-       +make -C $(SRCDIR)/tests/testrpa/build/$(OS)/$(ARCHDIR) clean
-       +make -C $(SRCDIR)/rgrep/build/$(OS)/$(ARCHDIR) clean
-
-install:
-       mkdir $(RPATK_INC_INSTALL)
-       mkdir $(RPATK_INC_INSTALL)/rlib
-       mkdir $(RPATK_INC_INSTALL)/rvm
-       mkdir $(RPATK_INC_INSTALL)/rpa
-       cp $(SRCDIR)/arch/$(OS)/$(ARCHDIR)/rtypes.h $(RPATK_INC_INSTALL)
-       +make -C $(SRCDIR)/rlib/build/$(OS)/$(ARCHDIR) install
-       +make -C $(SRCDIR)/rpa/build/$(OS)/$(ARCHDIR) install
-       +make -C $(SRCDIR)/rvm/build/$(OS)/$(ARCHDIR) install
-       +make -C $(SRCDIR)/rgrep/build/$(OS)/$(ARCHDIR) install
-
-uninstall:
-       +make -C $(SRCDIR)/rlib/build/$(OS)/$(ARCHDIR) uninstall
-       +make -C $(SRCDIR)/rpa/build/$(OS)/$(ARCHDIR) uninstall
-       +make -C $(SRCDIR)/rvm/build/$(OS)/$(ARCHDIR) uninstall
-       +make -C $(SRCDIR)/rgrep/build/$(OS)/$(ARCHDIR) uninstall
-       rm -rf $(RPATK_INC_INSTALL)/rlib
-       rm -rf $(RPATK_INC_INSTALL)/rvm
-       rm -rf $(RPATK_INC_INSTALL)/rpa
-       rm -rf $(RPATK_INC_INSTALL)
diff --git a/build/linux/build.mk b/build/linux/build.mk
deleted file mode 100644 (file)
index cae4a95..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-all:
-       +make -C $(SRCDIR)/rlib/build/$(OS)/$(ARCHDIR) all
-       +make -C $(SRCDIR)/rpa/build/$(OS)/$(ARCHDIR) all
-       +make -C $(SRCDIR)/rvm/build/$(OS)/$(ARCHDIR) all
-       +make -C $(SRCDIR)/rjs/build/$(OS)/$(ARCHDIR) all
-       +make -C $(SRCDIR)/tests/testmisc/build/$(OS)/$(ARCHDIR) all
-       +make -C $(SRCDIR)/tests/testrpa/build/$(OS)/$(ARCHDIR) all
-       +make -C $(SRCDIR)/tests/testrjs/build/$(OS)/$(ARCHDIR) all
-       +make -C $(SRCDIR)/rgrep/build/$(OS)/$(ARCHDIR) all
-
-distclean: clean
-       +make -C $(SRCDIR)/rlib/build/$(OS)/$(ARCHDIR) distclean
-       +make -C $(SRCDIR)/rpa/build/$(OS)/$(ARCHDIR) distclean
-       +make -C $(SRCDIR)/rvm/build/$(OS)/$(ARCHDIR) distclean
-       +make -C $(SRCDIR)/rjs/build/$(OS)/$(ARCHDIR) distclean
-       +make -C $(SRCDIR)/tests/testmisc/build/$(OS)/$(ARCHDIR) distclean
-       +make -C $(SRCDIR)/tests/testrpa/build/$(OS)/$(ARCHDIR) distclean
-       +make -C $(SRCDIR)/tests/testrjs/build/$(OS)/$(ARCHDIR) distclean
-       +make -C $(SRCDIR)/rgrep/build/$(OS)/$(ARCHDIR) distclean
-
-clean:
-       +make -C $(SRCDIR)/rlib/build/$(OS)/$(ARCHDIR) clean
-       +make -C $(SRCDIR)/rpa/build/$(OS)/$(ARCHDIR) clean
-       +make -C $(SRCDIR)/rvm/build/$(OS)/$(ARCHDIR) clean
-       +make -C $(SRCDIR)/rjs/build/$(OS)/$(ARCHDIR) clean
-       +make -C $(SRCDIR)/tests/testmisc/build/$(OS)/$(ARCHDIR) clean
-       +make -C $(SRCDIR)/tests/testrpa/build/$(OS)/$(ARCHDIR) clean
-       +make -C $(SRCDIR)/tests/testrjs/build/$(OS)/$(ARCHDIR) clean
-       +make -C $(SRCDIR)/rgrep/build/$(OS)/$(ARCHDIR) clean
-
-$(RPATK_INC_INSTALL) :
-       mkdir $(RPATK_INC_INSTALL)
-
-$(RPATK_INC_INSTALL)/rlib :
-       mkdir $(RPATK_INC_INSTALL)/rlib
-
-$(RPATK_INC_INSTALL)/rvm :
-       mkdir $(RPATK_INC_INSTALL)/rvm
-
-$(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/$(OS)/$(ARCHDIR)/rtypes.h $(RPATK_INC_INSTALL)
-       +make -C $(SRCDIR)/rlib/build/$(OS)/$(ARCHDIR) install
-       +make -C $(SRCDIR)/rpa/build/$(OS)/$(ARCHDIR) install
-       +make -C $(SRCDIR)/rvm/build/$(OS)/$(ARCHDIR) install
-       +make -C $(SRCDIR)/rgrep/build/$(OS)/$(ARCHDIR) install
-       ldconfig -n $(RTK_LIB_INSTALL)
-
-uninstall:
-       +make -C $(SRCDIR)/rlib/build/$(OS)/$(ARCHDIR) uninstall
-       +make -C $(SRCDIR)/rpa/build/$(OS)/$(ARCHDIR) uninstall
-       +make -C $(SRCDIR)/rvm/build/$(OS)/$(ARCHDIR) uninstall
-       +make -C $(SRCDIR)/rgrep/build/$(OS)/$(ARCHDIR) uninstall
-       -rm -rf $(RPATK_INC_INSTALL)/rlib
-       -rm -rf $(RPATK_INC_INSTALL)/rvm
-       -rm -rf $(RPATK_INC_INSTALL)/rpa
-       -rm -rf $(RPATK_INC_INSTALL)
diff --git a/build/linux/i386/Makefile b/build/linux/i386/Makefile
deleted file mode 100644 (file)
index c72041e..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-SRCDIR = ../../..
-ARCHDIR = $(shell basename $(shell pwd))
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-
-include ../include.mk
-include ../build.mk
diff --git a/build/linux/include.mk b/build/linux/include.mk
deleted file mode 100644 (file)
index b11c915..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-RTK_LIB_INSTALL=/usr/lib
-RPATK_INC_INSTALL=/usr/include/rpatk
diff --git a/build/linux/x86_64/Makefile b/build/linux/x86_64/Makefile
deleted file mode 100644 (file)
index c72041e..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-SRCDIR = ../../..
-ARCHDIR = $(shell basename $(shell pwd))
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-
-include ../include.mk
-include ../build.mk
similarity index 89%
rename from build/template/linux/x86_64/Makefile
rename to build/template/unix/x86_64/Makefile
index d767226..065ef98 100644 (file)
@@ -2,7 +2,7 @@ SRCDIR = ../../..
 ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
+INCLUDE = -I$(SRCDIR)/arch/unix/$(ARCHDIR)
 
 CC = gcc
 AR = ar
diff --git a/build/unix/build.mk b/build/unix/build.mk
new file mode 100644 (file)
index 0000000..645419e
--- /dev/null
@@ -0,0 +1,59 @@
+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)/rjs/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)/tests/testrjs/build/unix/$(ARCHDIR) all
+       +make -C $(SRCDIR)/rgrep/build/unix/$(ARCHDIR) all
+
+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
+
+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)/rjs/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
+
+$(RPATK_INC_INSTALL) :
+       mkdir $(RPATK_INC_INSTALL)
+
+$(RPATK_INC_INSTALL)/rlib :
+       mkdir $(RPATK_INC_INSTALL)/rlib
+
+$(RPATK_INC_INSTALL)/rvm :
+       mkdir $(RPATK_INC_INSTALL)/rvm
+
+$(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
+       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
+       -rm -rf $(RPATK_INC_INSTALL)/rlib
+       -rm -rf $(RPATK_INC_INSTALL)/rvm
+       -rm -rf $(RPATK_INC_INSTALL)/rpa
+       -rm -rf $(RPATK_INC_INSTALL)
index 55421e9..194fbf0 100644 (file)
@@ -46,7 +46,7 @@ if test "$PHP_PRPA" != "no"; then
     AC_MSG_ERROR([RPATK dir not found in $SEARCH_PATH])
   fi
 
-  OS_DIR=linux
+  OS_DIR=unix
   MACH=`uname -m`
   if [[ $MACH == "i486" ]]; then MACH=i386; echo "MACH set to: $MACH"; fi
   if [[ $MACH == "i586" ]]; then MACH=i386; echo "MACH set to: $MACH"; fi
diff --git a/rgrep/build/darwin/rgrep.mk b/rgrep/build/darwin/rgrep.mk
deleted file mode 100644 (file)
index c52c042..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-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/$(OS)/$(ARCHDIR) -I$(RGREP_SRCDIR) -I$(RGREP_SRCDIR)/unix
-
-
-LIBS = -L$(RLIB_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RVM_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RPA_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -lrpa -lrvm -lrlib -lpthread -lm
-OBJECTS        = $(OUTDIR)/rpagrep.o $(OUTDIR)/main.o $(OUTDIR)/fsenum.o $(OUTDIR)/rpagrepdep.o $(OUTDIR)/rpagreputf.o
-RPAGREP        = rgrep
-
-
-all : $(OUTDIR) $(OUTDIR)/$(RPAGREP)
-
-$(OUTDIR)/$(RPAGREP) : $(OBJECTS)
-       $(CC) $(MACH) -o $@ $^ $(LIBS)
-
-
-$(OUTDIR)/%.o: $(RGREP_SRCDIR)/%.c
-       + $(CC) $(CFLAGS) -o $(OUTDIR)/$*.o -c $(RGREP_SRCDIR)/$*.c $(INCLUDE)
-
-$(OUTDIR)/%.o: $(RGREP_SRCDIR)/unix/%.c
-       + $(CC) $(CFLAGS) -o $(OUTDIR)/$*.o -c $(RGREP_SRCDIR)/unix/$*.c $(INCLUDE)
-
-
-$(OUTDIR):
-       @mkdir $(OUTDIR)
-
-distclean: clean
-       -rm -f .depend
-       -rm -rf $(OUTDIR)
-
-clean:
-       -rm -f $(TESTS)
-       -rm -f *~
-       -rm -f $(SRCDIR)/*~
-       -rm -f $(OBJECTS)
-       -rm -f $(OUTDIR)/$(RPAGREP)
-
-install:
-       cp $(OUTDIR)/$(RPAGREP) $(RPAGREP_BIN_INSTALL)
-
-uninstall:
-       -rm -f $(RPAGREP_BIN_INSTALL)/$(RPAGREP)
diff --git a/rgrep/build/linux/i386/Makefile b/rgrep/build/linux/i386/Makefile
deleted file mode 100644 (file)
index af54eb4..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-ARCHDIR = $(shell basename $(shell pwd))
-OUTDIR = out
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-SRCDIR = ../../../..
-MACH = -m32
-
-CC = gcc
-AR = ar
-
-CFLAGS = $(MACH)
-ifeq ($(BLDCFG), release)
-CFLAGS += -O3
-else
-ifeq ($(BLDCFG), profile)
-CFLAGS += -O0 -pg
-else
-CFLAGS += -g -O0 -Wall 
-endif
-endif
-
-ifeq ($(CCBLD), yes)
-CFLAGS += -fprofile-arcs -ftest-coverage
-endif
-
-CFLAGS += $(INCLUDE)
-LDFLAGS = $(MACH)
-
-
-include ../rgrep.mk
diff --git a/rgrep/build/linux/x86_64/Makefile b/rgrep/build/linux/x86_64/Makefile
deleted file mode 100644 (file)
index efc6949..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-ARCHDIR = $(shell basename $(shell pwd))
-OUTDIR = out
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-SRCDIR = ../../../..
-MACH = -m64
-
-CC = gcc
-AR = ar
-
-CFLAGS = $(MACH)
-ifeq ($(BLDCFG), release)
-CFLAGS += -O3
-else
-ifeq ($(BLDCFG), profile)
-CFLAGS += -O0 -pg
-else
-CFLAGS += -g -O0 -Wall 
-endif
-endif
-
-ifeq ($(CCBLD), yes)
-CFLAGS += -fprofile-arcs -ftest-coverage
-endif
-
-CFLAGS += $(INCLUDE)
-LDFLAGS = $(MACH)
-
-
-include ../rgrep.mk
similarity index 79%
rename from rgrep/build/linux/rgrep.mk
rename to rgrep/build/unix/rgrep.mk
index 124680f..f6db266 100644 (file)
@@ -3,12 +3,12 @@ RLIB_SRCDIR = $(SRCDIR)/rlib
 RVM_SRCDIR = $(SRCDIR)/rvm
 RPA_SRCDIR = $(SRCDIR)/rpa
 RGREP_SRCDIR = $(SRCDIR)/rgrep
-INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR) -I$(RGREP_SRCDIR) -I$(RGREP_SRCDIR)/unix
+INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/arch/unix/$(ARCHDIR) -I$(RGREP_SRCDIR) -I$(RGREP_SRCDIR)/unix
 
 
-LIBS = -L$(RLIB_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RVM_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RPA_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
+LIBS = -L$(RLIB_SRCDIR)/build/unix/$(ARCHDIR)/out 
+LIBS += -L$(RVM_SRCDIR)/build/unix/$(ARCHDIR)/out 
+LIBS += -L$(RPA_SRCDIR)/build/unix/$(ARCHDIR)/out 
 LIBS += -lrpa -lrvm -lrlib -lpthread -lm --static
 OBJECTS        = $(OUTDIR)/rpagrep.o $(OUTDIR)/main.o $(OUTDIR)/fsenum.o $(OUTDIR)/rpagrepdep.o $(OUTDIR)/rpagreputf.o
 RPAGREP        = rgrep
diff --git a/rjs/build/darwin/i386/Makefile b/rjs/build/darwin/i386/Makefile
deleted file mode 100644 (file)
index 0824497..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-SRCDIR = ../../../..
-ARCHDIR = $(shell basename $(shell pwd))
-OUTDIR = out
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
-MACH = -m32
-ELFARCH = mach-o-i386
-BINARCH = i386
-
-CC = gcc
-AR = ar
-LD = ld
-OC = gobjcopy
-
-ifeq ($(BLDCFG), release)
-CFLAGS := $(MACH) -fPIC -O3
-else
-CFLAGS := $(MACH) -fPIC -O0 -g -Wall 
-endif
-
-ifeq ($(CCBLD), yes)
-CFLAGS += -fprofile-arcs -ftest-coverage
-endif
-
-CFLAGS += $(INCLUDE)
-LDFLAGS := $(MACH)
-
-
-include ../rjs.mk
diff --git a/rjs/build/darwin/rjs.mk b/rjs/build/darwin/rjs.mk
deleted file mode 100644 (file)
index 636fac6..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-RLIB_SRCDIR = $(SRCDIR)/rlib
-RVM_SRCDIR = $(SRCDIR)/rvm
-RPA_SRCDIR = $(SRCDIR)/rpa
-RJS_SRCDIR = $(SRCDIR)/rjs
-RJS_LIB = $(OUTDIR)/librjs.a
-RJS_EXEC = $(OUTDIR)/rjsexec
-
-CFLAGS += -I$(SRCDIR)
-
-LIBS = -L$(RLIB_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RVM_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RPA_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RJS_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -lrjs -lrpa -lrvm -lrlib -lpthread -lm --static
-
-RJS_OBJECTS =  \
-       $(OUTDIR)/rjs.o \
-       $(OUTDIR)/rjsparser.o \
-       $(OUTDIR)/rjscompiler.o \
-       $(OUTDIR)/rjsrules.o \
-       $(OUTDIR)/rjsfile.o \
-       $(OUTDIR)/ecma262.o \
-
-
-RJSEXEC_OBJECTS =      \
-       $(OUTDIR)/rjsexec.o \
-
-all: $(OUTDIR) $(RJS_LIB)
-
-$(RJS_EXEC) : $(RJSEXEC_OBJECTS) $(RJS_LIB) $(RJS_OBJECTS)
-       $(CC) $(ARCH) -o $@ $< $(LIBS)
-
-$(OUTDIR)/%.o: $(RJS_SRCDIR)/%.c
-       $(CC) $(CFLAGS) -o $(OUTDIR)/$*.o -c $(RJS_SRCDIR)/$*.c
-
-$(OUTDIR)/%.o: $(RJS_SRCDIR)/unix/%.c
-       $(CC) $(CFLAGS) -o $(OUTDIR)/$*.o -c $(RJS_SRCDIR)/unix/$*.c
-
-$(RJS_LIB): $(RJS_OBJECTS)
-       $(AR) -cr $@ $^
-
-$(RJS_SO): $(RJS_OBJECTS)
-       $(CC) $(LDFLAGS) -shared -Wl,-soname,librjs.so -o $@ $^
-
-$(OUTDIR)/%.o: $(RJS_SRCDIR)/%.rpa
-       $(OC) --input-target binary --output-target $(ELFARCH) --binary-architecture $(BINARCH) $(RJS_SRCDIR)/$*.rpa $(OUTDIR)/$*.o
-#      gobjcopy -I binary -O mach-o-x86-64 -B i386:x86-64 $(RJS_SRCDIR)/$*.rpa $(OUTDIR)/$*.o
-
-
-
-$(OUTDIR):
-       @mkdir $(OUTDIR)
-
-distclean: clean
-       -rm -f .depend
-       -rm -rf $(OUTDIR)
-
-clean:
-       -rm -f $(RJS_LIB)
-       -rm -f $(RJS_SO)
-       -rm -f $(RJS_OBJECTS)
-       -rm -f *~
-       -rm -f $(SRCDIR)/*~
-
diff --git a/rjs/build/darwin/x86_64/Makefile b/rjs/build/darwin/x86_64/Makefile
deleted file mode 100644 (file)
index 06b6114..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-SRCDIR = ../../../..
-ARCHDIR = $(shell basename $(shell pwd))
-OUTDIR = out
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
-MACH = -m64
-ELFARCH = mach-o-x86-64
-BINARCH = i386:x86-64
-
-CC = gcc
-AR = ar
-LD = ld
-OC = gobjcopy
-
-ifeq ($(BLDCFG), release)
-CFLAGS := $(MACH) -fPIC -O3
-else
-CFLAGS := $(MACH) -fPIC -O0 -g -Wall 
-endif
-
-ifeq ($(CCBLD), yes)
-CFLAGS += -fprofile-arcs -ftest-coverage
-endif
-
-CFLAGS += $(INCLUDE)
-LDFLAGS := $(MACH)
-
-
-include ../rjs.mk
similarity index 92%
rename from rjs/build/linux/i386/Makefile
rename to rjs/build/unix/i386/Makefile
index 6a6bf8f..e952dbb 100644 (file)
@@ -2,7 +2,7 @@ SRCDIR = ../../../..
 ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
+INCLUDE = -I$(SRCDIR)/arch/unix/$(ARCHDIR)
 MACH = -m32
 ELFARCH = elf32-i386
 BINARCH = i386
similarity index 86%
rename from rjs/build/linux/rjs.mk
rename to rjs/build/unix/rjs.mk
index 61d67fa..f956aef 100644 (file)
@@ -8,10 +8,10 @@ RJS_EXEC = $(OUTDIR)/rjsexec
 
 CFLAGS += -I$(SRCDIR)
 
-LIBS = -L$(RLIB_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RVM_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RPA_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RJS_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
+LIBS = -L$(RLIB_SRCDIR)/build/unix/$(ARCHDIR)/out 
+LIBS += -L$(RVM_SRCDIR)/build/unix/$(ARCHDIR)/out 
+LIBS += -L$(RPA_SRCDIR)/build/unix/$(ARCHDIR)/out 
+LIBS += -L$(RJS_SRCDIR)/build/unix/$(ARCHDIR)/out 
 LIBS += -lrjs -lrpa -lrvm -lrlib -lpthread -lm --static
 
 RJS_OBJECTS =  \
similarity index 92%
rename from rjs/build/linux/x86_64/Makefile
rename to rjs/build/unix/x86_64/Makefile
index 5240399..83afc5b 100644 (file)
@@ -2,7 +2,7 @@ SRCDIR = ../../../..
 ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
+INCLUDE = -I$(SRCDIR)/arch/unix/$(ARCHDIR)
 MACH = -m64
 ELFARCH = elf64-x86-64
 BINARCH = i386:x86-64
diff --git a/rlib/build/darwin/i386/Makefile b/rlib/build/darwin/i386/Makefile
deleted file mode 100644 (file)
index 09876c0..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-SRCDIR = ../../../..
-ARCHDIR = $(shell basename $(shell pwd))
-OUTDIR = out
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
-MACH = -m32
-
-CC = gcc
-AR = ar
-LD = ld
-
-CFLAGS := $(MACH)
-ifeq ($(BLDCFG), release)
-CFLAGS += -fPIC -O3
-else 
-ifeq ($(BLDCFG), profile)
-CFLAGS += -fPIC -O0 -pg -Wall
-CFLAGS += -DR_DEBUG_MEMALLOC
-else
-CFLAGS += -fPIC -O0 -g -Wall
-CFLAGS += -DR_DEBUG_MEMALLOC
-endif
-endif
-
-ifeq ($(CCBLD), yes)
-CFLAGS += -fprofile-arcs -ftest-coverage
-endif
-
-CFLAGS +=  $(INCLUDE)
-LDFLAGS := $(MACH)
-
-include $(SRCDIR)/build/$(OS)/include.mk
-include ../rlib.mk
diff --git a/rlib/build/darwin/rlib.mk b/rlib/build/darwin/rlib.mk
deleted file mode 100644 (file)
index 4bd95c8..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-RPATK_LIB_INSTALL=/usr/lib
-RLIB_SRCDIR = $(SRCDIR)/rlib
-RLIB_SO_VERSION = 2.0
-RLIB_SO_NAME = librlib.so
-RLIB_LIB = librlib.a
-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)
-
-RLIB_OBJECTS +=        $(OUTDIR)/rref.o
-RLIB_OBJECTS +=        $(OUTDIR)/rcharconv.o
-RLIB_OBJECTS +=        $(OUTDIR)/robject.o
-RLIB_OBJECTS +=        $(OUTDIR)/rgc.o
-RLIB_OBJECTS +=        $(OUTDIR)/rmem.o
-RLIB_OBJECTS +=        $(OUTDIR)/rmath.o
-RLIB_OBJECTS +=        $(OUTDIR)/ratomic.o
-RLIB_OBJECTS +=        $(OUTDIR)/rspinlock.o
-RLIB_OBJECTS +=        $(OUTDIR)/rharray.o
-RLIB_OBJECTS +=        $(OUTDIR)/rcarray.o
-RLIB_OBJECTS +=        $(OUTDIR)/rarray.o
-RLIB_OBJECTS +=        $(OUTDIR)/rhash.o
-RLIB_OBJECTS +=        $(OUTDIR)/rmap.o
-RLIB_OBJECTS +=        $(OUTDIR)/rstring.o
-RLIB_OBJECTS +=        $(OUTDIR)/rlist.o
-RLIB_OBJECTS +=        $(OUTDIR)/rutf.o
-
-
-all: $(OUTDIR) $(TARGET_RLIB_LIB)
-
-
-
-$(OUTDIR)/%.o: $(RLIB_SRCDIR)/%.c
-       + $(CC) $(CFLAGS) -o $(OUTDIR)/$*.o -c $(RLIB_SRCDIR)/$*.c
-
-$(TARGET_RLIB_LIB): $(RLIB_OBJECTS)
-       $(AR) -cr $@ $^
-
-$(OUTDIR):
-       @mkdir $(OUTDIR)
-
-distclean: clean
-       -rm -f .depend
-       -rm -rf $(OUTDIR)
-
-clean:
-       -rm -f $(TARGET_RLIB_LIB)
-       -rm -f $(TARGET_RLIB_SO)
-       -rm -f $(RLIB_OBJECTS)
-       -rm -f *~
-       -rm -f $(SRCDIR)/*~
-
-install:
-       cp $(TARGET_RLIB_LIB) $(RPATK_LIB_INSTALL)
-       cp $(RLIB_SRCDIR)/*.h $(RPATK_INC_INSTALL)/rlib
-
-
-uninstall:
-       -rm -f $(RPATK_LIB_INSTALL)/$(RLIB_LIB)
-       -rm -f $(RPATK_INC_INSTALL)/rlib/*
diff --git a/rlib/build/linux/x86_64/Makefile b/rlib/build/linux/x86_64/Makefile
deleted file mode 100644 (file)
index f55e903..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-SRCDIR = ../../../..
-ARCHDIR = $(shell basename $(shell pwd))
-OUTDIR = out
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
-MACH = -m64
-
-CC = gcc
-AR = ar
-LD = ld
-
-CFLAGS := $(MACH)
-ifeq ($(BLDCFG), release)
-CFLAGS += -fPIC -O3
-else 
-ifeq ($(BLDCFG), profile)
-CFLAGS += -fPIC -O0 -pg -Wall
-CFLAGS += -DR_DEBUG_MEMALLOC
-else
-CFLAGS += -fPIC -O0 -g -Wall
-CFLAGS += -DR_DEBUG_MEMALLOC
-endif
-endif
-
-ifeq ($(CCBLD), yes)
-CFLAGS += -fprofile-arcs -ftest-coverage
-endif
-
-CFLAGS +=  $(INCLUDE)
-LDFLAGS := $(MACH)
-
-include $(SRCDIR)/build/$(OS)/include.mk
-include ../rlib.mk
similarity index 86%
rename from rlib/build/linux/i386/Makefile
rename to rlib/build/unix/i386/Makefile
index 09876c0..72bcdf1 100644 (file)
@@ -2,7 +2,7 @@ SRCDIR = ../../../..
 ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
+INCLUDE = -I$(SRCDIR)/arch/unix/$(ARCHDIR)
 MACH = -m32
 
 CC = gcc
@@ -29,5 +29,5 @@ endif
 CFLAGS +=  $(INCLUDE)
 LDFLAGS := $(MACH)
 
-include $(SRCDIR)/build/$(OS)/include.mk
+include $(SRCDIR)/build/unix/include.mk
 include ../rlib.mk
similarity index 86%
rename from rlib/build/darwin/x86_64/Makefile
rename to rlib/build/unix/x86_64/Makefile
index f55e903..e3bcacb 100644 (file)
@@ -2,7 +2,7 @@ SRCDIR = ../../../..
 ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
+INCLUDE = -I$(SRCDIR)/arch/unix/$(ARCHDIR)
 MACH = -m64
 
 CC = gcc
@@ -29,5 +29,5 @@ endif
 CFLAGS +=  $(INCLUDE)
 LDFLAGS := $(MACH)
 
-include $(SRCDIR)/build/$(OS)/include.mk
+include $(SRCDIR)/build/unix/include.mk
 include ../rlib.mk
diff --git a/rpa/build/darwin/rpa.mk b/rpa/build/darwin/rpa.mk
deleted file mode 100644 (file)
index 698e5c1..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-RPA_SRCDIR = $(SRCDIR)/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)
-
-RPA_OBJECTS =  \
-       $(OUTDIR)/rpacache.o \
-       $(OUTDIR)/rpadbex.o \
-       $(OUTDIR)/rpastat.o \
-       $(OUTDIR)/rparecord.o \
-       $(OUTDIR)/rpavm.o \
-       $(OUTDIR)/rpacompiler.o \
-       $(OUTDIR)/rpaparser.o \
-       $(OUTDIR)/rpaoptimization.o \
-       $(OUTDIR)/rpabitmap.o \
-
-
-all: $(OUTDIR) $(TARGET_RPA_LIB)
-
-$(OUTDIR)/%.o: $(RPA_SRCDIR)/%.c
-       $(CC) $(CFLAGS) -o $(OUTDIR)/$*.o -c $(RPA_SRCDIR)/$*.c
-
-$(TARGET_RPA_LIB): $(RPA_OBJECTS)
-       $(AR) -cr $@ $^
-
-$(OUTDIR):
-       @mkdir $(OUTDIR)
-
-distclean: clean
-       -rm -f .depend
-       -rm -rf $(OUTDIR)
-
-clean:
-       -rm -f $(TARGET_RPA_LIB)
-       -rm -f $(TARGET_RPA_SO)
-       -rm -f $(RPA_OBJECTS)
-       -rm -f *~
-       -rm -f $(SRCDIR)/*~
-
-install:
-       cp $(TARGET_RPA_LIB) $(RTK_LIB_INSTALL)
-       cp $(RPA_SRCDIR)/*.h $(RPATK_INC_INSTALL)/rpa
-
-uninstall:
-       -rm -f $(RTK_LIB_INSTALL)/$(RPA_LIB)
-       -rm -f $(RPATK_INC_INSTALL)/rpa/*
diff --git a/rpa/build/darwin/x86_64/Makefile b/rpa/build/darwin/x86_64/Makefile
deleted file mode 100644 (file)
index 1a333c0..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-SRCDIR = ../../../..
-ARCHDIR = $(shell basename $(shell pwd))
-OUTDIR = out
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
-MACH = -m64
-
-CC = gcc
-AR = ar
-LD = ld
-
-CFLAGS := $(MACH)
-ifeq ($(BLDCFG), release)
-CFLAGS += -fPIC -O3
-else
-CFLAGS += -fPIC -O0 -g -Wall 
-endif
-
-ifeq ($(CCBLD), yes)
-CFLAGS += -fprofile-arcs -ftest-coverage
-endif
-
-CFLAGS += $(INCLUDE)
-LDFLAGS := $(MACH)
-
-include $(SRCDIR)/build/$(OS)/include.mk
-include ../rpa.mk
diff --git a/rpa/build/linux/i386/Makefile b/rpa/build/linux/i386/Makefile
deleted file mode 100644 (file)
index 06a4a53..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-SRCDIR = ../../../..
-ARCHDIR = $(shell basename $(shell pwd))
-OUTDIR = out
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
-MACH = -m32
-
-CC = gcc
-AR = ar
-LD = ld
-
-CFLAGS := $(MACH)
-ifeq ($(BLDCFG), release)
-CFLAGS += -fPIC -O3
-else
-CFLAGS += -fPIC -O0 -g -Wall 
-endif
-
-ifeq ($(CCBLD), yes)
-CFLAGS += -fprofile-arcs -ftest-coverage
-endif
-
-CFLAGS += $(INCLUDE)
-LDFLAGS := $(MACH)
-
-include $(SRCDIR)/build/$(OS)/include.mk
-include ../rpa.mk
similarity index 82%
rename from rpa/build/darwin/i386/Makefile
rename to rpa/build/unix/i386/Makefile
index 06a4a53..d4902f7 100644 (file)
@@ -2,7 +2,7 @@ SRCDIR = ../../../..
 ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
+INCLUDE = -I$(SRCDIR)/arch/unix/$(ARCHDIR)
 MACH = -m32
 
 CC = gcc
@@ -23,5 +23,5 @@ endif
 CFLAGS += $(INCLUDE)
 LDFLAGS := $(MACH)
 
-include $(SRCDIR)/build/$(OS)/include.mk
+include $(SRCDIR)/build/unix/include.mk
 include ../rpa.mk
similarity index 100%
rename from rpa/build/linux/rpa.mk
rename to rpa/build/unix/rpa.mk
similarity index 82%
rename from rpa/build/linux/x86_64/Makefile
rename to rpa/build/unix/x86_64/Makefile
index 1a333c0..92577b2 100644 (file)
@@ -2,7 +2,7 @@ SRCDIR = ../../../..
 ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
+INCLUDE = -I$(SRCDIR)/arch/unix/$(ARCHDIR)
 MACH = -m64
 
 CC = gcc
@@ -23,5 +23,5 @@ endif
 CFLAGS += $(INCLUDE)
 LDFLAGS := $(MACH)
 
-include $(SRCDIR)/build/$(OS)/include.mk
+include $(SRCDIR)/build/unix/include.mk
 include ../rpa.mk
diff --git a/rvm/build/darwin/i386/Makefile b/rvm/build/darwin/i386/Makefile
deleted file mode 100644 (file)
index 0b1cbe9..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-SRCDIR = ../../../..
-ARCHDIR = $(shell basename $(shell pwd))
-OUTDIR = out
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
-MACH = -m32
-
-CC = gcc
-AR = ar
-LD = ld
-
-CFLAGS += $(MACH)
-ifeq ($(BLDCFG), release)
-CFLAGS += -fPIC -O3
-else
-ifeq ($(BLDCFG), profile)
-CFLAGS += -fPIC -O0 -pg -Wall 
-else
-CFLAGS += -fPIC -O0 -g -Wall 
-endif
-endif
-
-ifeq ($(CCBLD), yes)
-CFLAGS += -fprofile-arcs -ftest-coverage
-endif
-
-
-CFLAGS += $(INCLUDE)
-LDFLAGS := $(MACH)
-
-include $(SRCDIR)/build/$(OS)/include.mk
-include ../rvm.mk
diff --git a/rvm/build/darwin/rvm.mk b/rvm/build/darwin/rvm.mk
deleted file mode 100644 (file)
index 9f47d6d..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-RTK_LIB_INSTALL=/usr/lib
-RVM_SRCDIR = $(SRCDIR)/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)
-
-RVM_OBJECTS += $(OUTDIR)/rvmcpu.o 
-RVM_OBJECTS += $(OUTDIR)/rvmoperator.o
-RVM_OBJECTS += $(OUTDIR)/rvmcodemap.o
-RVM_OBJECTS += $(OUTDIR)/rvmrelocmap.o
-RVM_OBJECTS += $(OUTDIR)/rvmcodegen.o
-RVM_OBJECTS += $(OUTDIR)/rvmreg.o
-RVM_OBJECTS += $(OUTDIR)/rvmscope.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatorbin.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatoradd.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatorand.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatoreq.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatornoteq.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatorlogicor.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatorlogicand.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatorlogicnot.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatorless.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatorlesseq.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatorgreater.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatorgreatereq.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatorxor.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatoror.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatorcmp.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatorcmn.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatorlsl.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatorlsr.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatorlsru.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatorcast.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatorcat.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatorsub.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatormul.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatordiv.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatormod.o
-RVM_OBJECTS += $(OUTDIR)/rvmoperatornot.o
-
-
-all: $(OUTDIR) $(TARGET_RVM_LIB)
-
-
-$(OUTDIR)/%.o: $(RVM_SRCDIR)/%.c
-       + $(CC) $(CFLAGS) -o $(OUTDIR)/$*.o -c $(RVM_SRCDIR)/$*.c
-
-$(TARGET_RVM_LIB): $(RVM_OBJECTS)
-       $(AR) -cr $@ $^
-
-$(OUTDIR):
-       @mkdir $(OUTDIR)
-
-distclean: clean
-       -rm -f .depend
-       -rm -rf $(OUTDIR)
-
-clean:
-       -rm -f $(TARGET_RVM_LIB)
-       -rm -f $(TARGET_RVM_SO)
-       -rm -f $(RVM_OBJECTS)
-       -rm -f *~
-       -rm -f $(SRCDIR)/*~
-
-install:
-       cp $(TARGET_RVM_LIB) $(RTK_LIB_INSTALL)
-       cp $(RVM_SRCDIR)/*.h $(RPATK_INC_INSTALL)/rvm
-
-uninstall:
-       -rm -f $(RTK_LIB_INSTALL)/$(RVM_LIB)
-       -rm -f $(RPATK_INC_INSTALL)/rvm/*
diff --git a/rvm/build/linux/x86_64/Makefile b/rvm/build/linux/x86_64/Makefile
deleted file mode 100644 (file)
index a64eff9..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-SRCDIR = ../../../..
-ARCHDIR = $(shell basename $(shell pwd))
-OUTDIR = out
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
-MACH = -m64
-
-CC = gcc
-AR = ar
-LD = ld
-
-CFLAGS += $(MACH)
-ifeq ($(BLDCFG), release)
-CFLAGS += -fPIC -O3
-else
-ifeq ($(BLDCFG), profile)
-CFLAGS += -fPIC -O0 -pg -Wall 
-else
-CFLAGS += -fPIC -O0 -g -Wall 
-endif
-endif
-
-ifeq ($(CCBLD), yes)
-CFLAGS += -fprofile-arcs -ftest-coverage
-endif
-
-
-CFLAGS += $(INCLUDE)
-LDFLAGS := $(MACH)
-
-include $(SRCDIR)/build/$(OS)/include.mk
-include ../rvm.mk
similarity index 84%
rename from rvm/build/linux/i386/Makefile
rename to rvm/build/unix/i386/Makefile
index 0b1cbe9..57595b9 100644 (file)
@@ -2,7 +2,7 @@ SRCDIR = ../../../..
 ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
+INCLUDE = -I$(SRCDIR)/arch/unix/$(ARCHDIR)
 MACH = -m32
 
 CC = gcc
@@ -28,5 +28,5 @@ endif
 CFLAGS += $(INCLUDE)
 LDFLAGS := $(MACH)
 
-include $(SRCDIR)/build/$(OS)/include.mk
+include $(SRCDIR)/build/unix/include.mk
 include ../rvm.mk
similarity index 100%
rename from rvm/build/linux/rvm.mk
rename to rvm/build/unix/rvm.mk
similarity index 84%
rename from rvm/build/darwin/x86_64/Makefile
rename to rvm/build/unix/x86_64/Makefile
index a64eff9..13450eb 100644 (file)
@@ -2,7 +2,7 @@ SRCDIR = ../../../..
 ARCHDIR = $(shell basename $(shell pwd))
 OUTDIR = out
 OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-INCLUDE = -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
+INCLUDE = -I$(SRCDIR)/arch/unix/$(ARCHDIR)
 MACH = -m64
 
 CC = gcc
@@ -28,5 +28,5 @@ endif
 CFLAGS += $(INCLUDE)
 LDFLAGS := $(MACH)
 
-include $(SRCDIR)/build/$(OS)/include.mk
+include $(SRCDIR)/build/unix/include.mk
 include ../rvm.mk
diff --git a/tests/testmisc/build/darwin/misc-tests.mk b/tests/testmisc/build/darwin/misc-tests.mk
deleted file mode 100644 (file)
index d4e4d4f..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-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/$(OS)/$(ARCHDIR) -I$(RPA_SRCDIR)
-
-LIBS += -L$(RLIB_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RVM_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RPA_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -lrpa -lrvm -lrlib -lpthread -lm
-
-
-TESTS  += $(OUTDIR)/funcarg-test
-TESTS   += $(OUTDIR)/codegen-test
-TESTS   += $(OUTDIR)/codemap-test
-TESTS   += $(OUTDIR)/opmap-test
-TESTS   += $(OUTDIR)/string-test
-TESTS   += $(OUTDIR)/rlock-test
-TESTS   += $(OUTDIR)/rarray-test
-TESTS   += $(OUTDIR)/rcarray-test
-TESTS   += $(OUTDIR)/rharray-test
-TESTS   += $(OUTDIR)/rmap-test
-TESTS   += $(OUTDIR)/scope-test
-TESTS   += $(OUTDIR)/rhash-test
-TESTS   += $(OUTDIR)/rvm-test
-TESTS   += $(OUTDIR)/loop-test
-TESTS   += $(OUTDIR)/speed-test
-TESTS   += $(OUTDIR)/memalloc-test
-TESTS   += $(OUTDIR)/asm-cast
-TESTS   += $(OUTDIR)/asm-add
-TESTS   += $(OUTDIR)/asm-adds
-TESTS   += $(OUTDIR)/asm-b
-TESTS   += $(OUTDIR)/asm-bitops
-TESTS   += $(OUTDIR)/asm-callback
-TESTS   += $(OUTDIR)/asm-clz
-TESTS   += $(OUTDIR)/asm-cmp
-TESTS   += $(OUTDIR)/asm-div
-TESTS   += $(OUTDIR)/asm-loadstore
-TESTS   += $(OUTDIR)/asm-mul
-TESTS   += $(OUTDIR)/asm-sbc
-TESTS   += $(OUTDIR)/asm-shiftops
-TESTS   += $(OUTDIR)/asm-stack
-TESTS   += $(OUTDIR)/asm-bl
-TESTS   += $(OUTDIR)/asm-ecmp
-TESTS   += $(OUTDIR)/asm-esub
-TESTS   += $(OUTDIR)/asm-eadd
-
-
-all : $(OUTDIR) $(TESTS)
-
-$(OUTDIR)/%: $(TESTS_SRCDIR)/%.c
-       + $(CC) $(CFLAGS) -o $(OUTDIR)/$* $(TESTS_SRCDIR)/$*.c $(LIBS) $(INCLUDE)
-
-
-$(OUTDIR)/%.o: $(TESTS_SRCDIR)/%.rpa
-       $(LD) -r -b binary -o $(OUTDIR)/$*.o $(TESTS_SRCDIR)/$*.rpa
-
-
-$(OUTDIR):
-       @mkdir $(OUTDIR)
-
-distclean: clean
-       -rm -f .depend
-       -rm -rf $(OUTDIR)
-
-clean:
-       -rm -f $(TESTS)
-       -rm -f *~
-       -rm -f $(SRCDIR)/*~
-
diff --git a/tests/testmisc/build/linux/i386/Makefile b/tests/testmisc/build/linux/i386/Makefile
deleted file mode 100644 (file)
index 22e06b7..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-ARCHDIR = $(shell basename $(shell pwd))
-OUTDIR = out
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-SRCDIR = ../../../../..
-MACH = -m32
-
-CC = gcc
-AR = ar
-ifeq ($(BLDCFG), release)
-CFLAGS = -O3
-else
-ifeq ($(BLDCFG), profile)
-CFLAGS = -O0 -pg
-else
-CFLAGS = -g -O0 -Wall 
-endif
-endif
-
-ifeq ($(CCBLD), yes)
-CFLAGS += -fprofile-arcs -ftest-coverage
-endif
-
-CFLAGS += $(MACH) $(INCLUDE)
-
-CFLAGS := $(CFLAGS)
-LDFLAGS = $(MACH)
-
-
-include ../misc-tests.mk
diff --git a/tests/testmisc/build/linux/x86_64/Makefile b/tests/testmisc/build/linux/x86_64/Makefile
deleted file mode 100644 (file)
index afe6f4e..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-ARCHDIR = $(shell basename $(shell pwd))
-OUTDIR = out
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-SRCDIR = ../../../../..
-MACH = -m64
-
-CC = gcc
-AR = ar
-ifeq ($(BLDCFG), release)
-CFLAGS = -O3
-else
-ifeq ($(BLDCFG), profile)
-CFLAGS = -O0 -pg
-else
-CFLAGS = -g -O0 -Wall 
-endif
-endif
-
-ifeq ($(CCBLD), yes)
-CFLAGS += -fprofile-arcs -ftest-coverage
-endif
-
-CFLAGS += $(MACH) $(INCLUDE)
-
-CFLAGS := $(CFLAGS)
-LDFLAGS = $(MACH)
-
-
-include ../misc-tests.mk
similarity index 85%
rename from tests/testmisc/build/linux/misc-tests.mk
rename to tests/testmisc/build/unix/misc-tests.mk
index 54d3602..7b71833 100644 (file)
@@ -4,12 +4,12 @@ RVM_SRCDIR = $(SRCDIR)/rvm
 RPA_SRCDIR = $(SRCDIR)/rpa
 RAST_SRCDIR = $(SRCDIR)/rast
 TESTS_SRCDIR = $(SRCDIR)/tests/testmisc
-INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR) -I$(RPA_SRCDIR)
+INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/arch/unix/$(ARCHDIR) -I$(RPA_SRCDIR)
 
-LIBS =  -L$(ROBJECT_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RLIB_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RVM_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RPA_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
+LIBS =  -L$(ROBJECT_SRCDIR)/build/unix/$(ARCHDIR)/out 
+LIBS += -L$(RLIB_SRCDIR)/build/unix/$(ARCHDIR)/out 
+LIBS += -L$(RVM_SRCDIR)/build/unix/$(ARCHDIR)/out 
+LIBS += -L$(RPA_SRCDIR)/build/unix/$(ARCHDIR)/out 
 LIBS += -lrpa -lrvm -lrlib -lpthread -lm --static
 
 
diff --git a/tests/testrjs/build/darwin/testrjs.mk b/tests/testrjs/build/darwin/testrjs.mk
deleted file mode 100644 (file)
index 7a29373..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-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/$(OS)/$(ARCHDIR)
-
-LIBS =  -L$(ROBJECT_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RLIB_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RVM_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RJS_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RPA_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -lrjs -lrpa -lrvm -lrlib -lpthread -lm
-
-
-TESTS   += $(OUTDIR)/rjs-simple
-TESTS   += $(OUTDIR)/rjs-args
-
-
-all : $(OUTDIR) $(TESTS)
-
-
-$(OUTDIR)/%: $(TESTS_SRCDIR)/%.c
-       + $(CC) $(CFLAGS) -o $(OUTDIR)/$* $(TESTS_SRCDIR)/$*.c  $(LIBS) $(INCLUDE)
-
-
-$(OUTDIR)/%.o: $(TESTS_SRCDIR)/%.rpa
-       $(LD) -r -b binary -o $(OUTDIR)/$*.o $(TESTS_SRCDIR)/$*.rpa
-
-
-$(OUTDIR):
-       @mkdir $(OUTDIR)
-
-distclean: clean
-       -rm -f .depend
-       -rm -rf $(OUTDIR)
-
-clean:
-       -rm -f $(TESTS)
-       -rm -f *~
-       -rm -f $(SRCDIR)/*~
-
diff --git a/tests/testrjs/build/linux/i386/Makefile b/tests/testrjs/build/linux/i386/Makefile
deleted file mode 100644 (file)
index 82589ef..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-ARCHDIR = $(shell basename $(shell pwd))
-OUTDIR = out
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-SRCDIR = ../../../../..
-MACH = -m32
-
-CC = gcc
-AR = ar
-ifeq ($(BLDCFG), release)
-CFLAGS = -O3
-else
-ifeq ($(BLDCFG), profile)
-CFLAGS = -O0 -pg
-else
-CFLAGS = -g -O0 -Wall 
-endif
-endif
-
-ifeq ($(CCBLD), yes)
-CFLAGS += -fprofile-arcs -ftest-coverage
-endif
-
-CFLAGS += $(MACH) $(INCLUDE)
-
-CFLAGS := $(CFLAGS)
-LDFLAGS = $(MACH)
-
-
-include ../testrjs.mk
diff --git a/tests/testrjs/build/linux/x86_64/Makefile b/tests/testrjs/build/linux/x86_64/Makefile
deleted file mode 100644 (file)
index f2fb1cb..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-ARCHDIR = $(shell basename $(shell pwd))
-OUTDIR = out
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-SRCDIR = ../../../../..
-MACH = -m64
-
-CC = gcc
-AR = ar
-ifeq ($(BLDCFG), release)
-CFLAGS = -O3
-else
-ifeq ($(BLDCFG), profile)
-CFLAGS = -O0 -pg
-else
-CFLAGS = -g -O0 -Wall 
-endif
-endif
-
-ifeq ($(CCBLD), yes)
-CFLAGS += -fprofile-arcs -ftest-coverage
-endif
-
-CFLAGS += $(MACH) $(INCLUDE)
-
-CFLAGS := $(CFLAGS)
-LDFLAGS = $(MACH)
-
-
-include ../testrjs.mk
similarity index 68%
rename from tests/testrjs/build/linux/testrjs.mk
rename to tests/testrjs/build/unix/testrjs.mk
index 04a66c3..8417620 100644 (file)
@@ -4,13 +4,13 @@ RVM_SRCDIR = $(SRCDIR)/rvm
 RPA_SRCDIR = $(SRCDIR)/rpa
 RJS_SRCDIR = $(SRCDIR)/rjs
 TESTS_SRCDIR = $(SRCDIR)/tests/testrjs
-INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
+INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/arch/unix/$(ARCHDIR)
 
-LIBS =  -L$(ROBJECT_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RLIB_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RVM_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RJS_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RPA_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
+LIBS =  -L$(ROBJECT_SRCDIR)/build/unix/$(ARCHDIR)/out 
+LIBS += -L$(RLIB_SRCDIR)/build/unix/$(ARCHDIR)/out 
+LIBS += -L$(RVM_SRCDIR)/build/unix/$(ARCHDIR)/out 
+LIBS += -L$(RJS_SRCDIR)/build/unix/$(ARCHDIR)/out 
+LIBS += -L$(RPA_SRCDIR)/build/unix/$(ARCHDIR)/out 
 LIBS += -lrjs -lrpa -lrvm -lrlib -lpthread -lm --static
 
 
diff --git a/tests/testrpa/build/darwin/testrpa2.mk b/tests/testrpa/build/darwin/testrpa2.mk
deleted file mode 100644 (file)
index eb11bb4..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-RLIB_SRCDIR = $(SRCDIR)/rlib
-RVM_SRCDIR = $(SRCDIR)/rvm
-RPA_SRCDIR = $(SRCDIR)/rpa
-TESTS_SRCDIR = $(SRCDIR)/tests/testrpa
-INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
-
-
-LIBS = -L$(RLIB_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RVM_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RPA_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -lrpa -lrvm -lrlib -lpthread -lm
-
-
-TESTS  += $(OUTDIR)/rpavm-matchchr
-TESTS  += $(OUTDIR)/rpavm-matchrng
-TESTS  += $(OUTDIR)/rpavm-mnode
-TESTS  += $(OUTDIR)/rpavm-ref
-;TESTS += $(OUTDIR)/rpacompiler-ruleloop
-;TESTS += $(OUTDIR)/rpacompiler-ruleloopcls
-TESTS  += $(OUTDIR)/rpacompiler-rulerec
-TESTS  += $(OUTDIR)/rpacompiler-rulealtrec
-TESTS  += $(OUTDIR)/rpacompiler-rule
-TESTS  += $(OUTDIR)/rpacompiler-exp
-TESTS  += $(OUTDIR)/rpacompiler-notexp
-TESTS  += $(OUTDIR)/rpacompiler-class
-TESTS  += $(OUTDIR)/rpacompiler-altexp
-TESTS  += $(OUTDIR)/rpacompiler-minusexp
-TESTS  += $(OUTDIR)/rpaparser-test
-
-
-all : $(OUTDIR) $(TESTS)
-
-
-$(OUTDIR)/%: $(TESTS_SRCDIR)/%.c
-       + $(CC) $(CFLAGS) -o $(OUTDIR)/$* $(TESTS_SRCDIR)/$*.c  -lrpa $(LIBS) $(INCLUDE)
-
-
-$(OUTDIR)/%.o: $(TESTS_SRCDIR)/%.rpa
-       $(LD) -r -b binary -o $(OUTDIR)/$*.o $(TESTS_SRCDIR)/$*.rpa
-
-
-$(OUTDIR):
-       @mkdir $(OUTDIR)
-
-distclean: clean
-       -rm -f .depend
-       -rm -rf $(OUTDIR)
-
-clean:
-       -rm -f $(TESTS)
-       -rm -f *~
-       -rm -f $(SRCDIR)/*~
-
diff --git a/tests/testrpa/build/linux/i386/Makefile b/tests/testrpa/build/linux/i386/Makefile
deleted file mode 100644 (file)
index 7b11aef..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-ARCHDIR = $(shell basename $(shell pwd))
-OUTDIR = out
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-SRCDIR = ../../../../..
-MACH = -m32
-
-CC = gcc
-AR = ar
-ifeq ($(BLDCFG), release)
-CFLAGS = -O3
-else
-ifeq ($(BLDCFG), profile)
-CFLAGS = -O0 -pg
-else
-CFLAGS = -g -O0 -Wall 
-endif
-endif
-
-ifeq ($(CCBLD), yes)
-CFLAGS += -fprofile-arcs -ftest-coverage
-endif
-
-CFLAGS += $(MACH) $(INCLUDE)
-
-CFLAGS := $(CFLAGS)
-LDFLAGS = $(MACH)
-
-
-include ../testrpa2.mk
diff --git a/tests/testrpa/build/linux/x86_64/Makefile b/tests/testrpa/build/linux/x86_64/Makefile
deleted file mode 100644 (file)
index ebad7dc..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-ARCHDIR = $(shell basename $(shell pwd))
-OUTDIR = out
-OS = $(shell uname | tr "[:upper:]" "[:lower:]")
-SRCDIR = ../../../../..
-MACH = -m64
-
-CC = gcc
-AR = ar
-ifeq ($(BLDCFG), release)
-CFLAGS = -O3
-else
-ifeq ($(BLDCFG), profile)
-CFLAGS = -O0 -pg
-else
-CFLAGS = -g -O0 -Wall 
-endif
-endif
-
-ifeq ($(CCBLD), yes)
-CFLAGS += -fprofile-arcs -ftest-coverage
-endif
-
-CFLAGS += $(MACH) $(INCLUDE)
-
-CFLAGS := $(CFLAGS)
-LDFLAGS = $(MACH)
-
-
-include ../testrpa2.mk
similarity index 84%
rename from tests/testrpa/build/linux/testrpa2.mk
rename to tests/testrpa/build/unix/testrpa2.mk
index 67d6156..5d554a0 100644 (file)
@@ -2,12 +2,12 @@ RLIB_SRCDIR = $(SRCDIR)/rlib
 RVM_SRCDIR = $(SRCDIR)/rvm
 RPA_SRCDIR = $(SRCDIR)/rpa
 TESTS_SRCDIR = $(SRCDIR)/tests/testrpa
-INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/arch/$(OS)/$(ARCHDIR)
+INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/arch/unix/$(ARCHDIR)
 
 
-LIBS = -L$(RLIB_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RVM_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
-LIBS += -L$(RPA_SRCDIR)/build/$(OS)/$(ARCHDIR)/out 
+LIBS = -L$(RLIB_SRCDIR)/build/unix/$(ARCHDIR)/out 
+LIBS += -L$(RVM_SRCDIR)/build/unix/$(ARCHDIR)/out 
+LIBS += -L$(RPA_SRCDIR)/build/unix/$(ARCHDIR)/out 
 LIBS += -lrpa -lrvm -lrlib -lpthread -lm --static