[cinvoke-svn] r35 - in trunk/cinvoke: . lib test

[will]

Author: will
Date: 2006-06-18 22:41:45 -0400 (Sun, 18 Jun 2006)
New Revision: 35

Added:
   trunk/cinvoke/targets.sh
Modified:
   trunk/cinvoke/Makefile
   trunk/cinvoke/lib/Makefile
   trunk/cinvoke/test/Makefile
Log:
make it easier to build on other cpus using the same makefiles


Modified: trunk/cinvoke/Makefile
===================================================================
--- trunk/cinvoke/Makefile      2006-06-19 02:25:28 UTC (rev 34)
+++ trunk/cinvoke/Makefile      2006-06-19 02:41:45 UTC (rev 35)
@@ -1,9 +1,12 @@
 PREFIX = /usr/local
 
-all:
-       cd lib && $(MAKE)
-       cd test && $(MAKE)
+default:
+       sh targets.sh
 
+x86:
+       cd lib && $(MAKE) BUILDARCH=-DARCH_GCC_X86_UNIX
+       cd test && $(MAKE) BUILDARCH=-DARCH_GCC_X86_UNIX
+
 install: all
        install lib/cinvoke.h lib/cinvoke-arch.h $(PREFIX)/include
        install lib/arch/gcc_x86_unix.h $(PREFIX)/include/cinvoke-archspec.h

Modified: trunk/cinvoke/lib/Makefile
===================================================================
--- trunk/cinvoke/lib/Makefile  2006-06-19 02:25:28 UTC (rev 34)
+++ trunk/cinvoke/lib/Makefile  2006-06-19 02:41:45 UTC (rev 35)
@@ -15,7 +15,7 @@
        ranlib $(TARGET)
 
 .c.o:
-       gcc -g -Wall -Werror -DARCH_GCC_X86_UNIX -DCINVOKE_BUILD -c $< -o $@
+       gcc -g -Wall -Werror $(BUILDARCH) -DCINVOKE_BUILD -c $< -o $@
 
 cinvoke.o: cinvoke.c cinvoke.h cinvoke-arch.h arch/gcc_x86_unix.h \
   cinvoke-private.h hashtable.h

Added: trunk/cinvoke/targets.sh
===================================================================
--- trunk/cinvoke/targets.sh                            (rev 0)
+++ trunk/cinvoke/targets.sh    2006-06-19 02:41:45 UTC (rev 35)
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo "Please choose a target and enter: make <targetname>"
+echo "Options: x86"

Modified: trunk/cinvoke/test/Makefile
===================================================================
--- trunk/cinvoke/test/Makefile 2006-06-19 02:25:28 UTC (rev 34)
+++ trunk/cinvoke/test/Makefile 2006-06-19 02:41:45 UTC (rev 35)
@@ -7,4 +7,4 @@
        gcc -g -shared -fPIC lib.c -o lib.so -Wall -Werror
 
 runtests: runtests.c lib.so
-       gcc -g -DCINVOKE_BUILD -DARCH_GCC_X86_UNIX -o runtests runtests.c -Wall 
-Werror -L../lib -I../lib `sh ../tools/libdl.sh` -lcinvoke -lm
+       gcc -g -DCINVOKE_BUILD $(BUILDARCH) -o runtests runtests.c -Wall 
-Werror -L../lib -I../lib `sh ../tools/libdl.sh` -lcinvoke -lm