[cinvoke-svn] r72 - in trunk/cinvoke: . lib tools

[will]

Author: will
Date: 2006-07-05 19:44:56 -0400 (Wed, 05 Jul 2006)
New Revision: 72

Added:
   trunk/cinvoke/Makefile.x64
   trunk/cinvoke/Makefile.x86
   trunk/cinvoke/configure.sh
Removed:
   trunk/cinvoke/Makefile
   trunk/cinvoke/lib/Makefile
   trunk/cinvoke/targets.sh
Modified:
   trunk/cinvoke/lib/Makefile.x64
   trunk/cinvoke/lib/Makefile.x86
   trunk/cinvoke/tools/libdl.sh
Log:
more changes to build system


Deleted: trunk/cinvoke/Makefile
===================================================================
--- trunk/cinvoke/Makefile      2006-07-04 16:07:24 UTC (rev 71)
+++ trunk/cinvoke/Makefile      2006-07-05 23:44:56 UTC (rev 72)
@@ -1,25 +0,0 @@
-PREFIX = /usr/local
-
-default:
-       sh targets.sh
-
-x86:
-       cd lib && $(MAKE) -f Makefile.x86 BUILDARCH=-DARCH_GCC_X86_UNIX
-       cd test && $(MAKE) BUILDARCH=-DARCH_GCC_X86_UNIX
-       cp -f lib/arch/gcc_x86_unix.h lib/cinvoke-archspec.h
-
-x64:
-       cd lib && $(MAKE) -f Makefile.x64 BUILDARCH=-DARCH_GCC_X64_UNIX
-       cd test && $(MAKE) BUILDARCH=-DARCH_GCC_X64_UNIX
-       cp -f lib/arch/gcc_x64_unix.h lib/cinvoke-archspec.h
-
-install:
-       install lib/cinvoke.h lib/cinvoke-arch.h lib/cinvoke-archspec.h 
$(PREFIX)/include
-       install lib/libcinvoke.a $(PREFIX)/lib
-
-clean:
-       cd lib && $(MAKE) clean
-       cd test && $(MAKE) clean
-
-test:
-       cd test && $(MAKE) test

Copied: trunk/cinvoke/Makefile.x64 (from rev 71, trunk/cinvoke/Makefile)
===================================================================
--- trunk/cinvoke/Makefile.x64                          (rev 0)
+++ trunk/cinvoke/Makefile.x64  2006-07-05 23:44:56 UTC (rev 72)
@@ -0,0 +1,17 @@
+PREFIX = /usr/local
+
+all:
+       cd lib && $(MAKE) BUILDARCH=-DARCH_GCC_X64_UNIX
+       cd test && $(MAKE) BUILDARCH=-DARCH_GCC_X64_UNIX
+       cp -f lib/arch/gcc_x64_unix.h lib/cinvoke-archspec.h
+
+install:
+       install lib/cinvoke.h lib/cinvoke-arch.h lib/cinvoke-archspec.h 
$(PREFIX)/include
+       install lib/libcinvoke.a $(PREFIX)/lib
+
+clean:
+       cd lib && $(MAKE) clean
+       cd test && $(MAKE) clean
+
+test:
+       cd test && $(MAKE) test

Copied: trunk/cinvoke/Makefile.x86 (from rev 71, trunk/cinvoke/Makefile)
===================================================================
--- trunk/cinvoke/Makefile.x86                          (rev 0)
+++ trunk/cinvoke/Makefile.x86  2006-07-05 23:44:56 UTC (rev 72)
@@ -0,0 +1,17 @@
+PREFIX = /usr/local
+
+all:
+       cd lib && $(MAKE) BUILDARCH=-DARCH_GCC_X86_UNIX
+       cd test && $(MAKE) BUILDARCH=-DARCH_GCC_X86_UNIX
+       cp -f lib/arch/gcc_x86_unix.h lib/cinvoke-archspec.h
+
+install:
+       install lib/cinvoke.h lib/cinvoke-arch.h lib/cinvoke-archspec.h 
$(PREFIX)/include
+       install lib/libcinvoke.a $(PREFIX)/lib
+
+clean:
+       cd lib && $(MAKE) clean
+       cd test && $(MAKE) clean
+
+test:
+       cd test && $(MAKE) test

Added: trunk/cinvoke/configure.sh
===================================================================
--- trunk/cinvoke/configure.sh                          (rev 0)
+++ trunk/cinvoke/configure.sh  2006-07-05 23:44:56 UTC (rev 72)
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+case "$1" in
+       'x86')
+               ln -s Makefile.x86 Makefile
+               cd lib ; ln -s Makefile.x86 Makefile
+               ;;
+       'x64')
+               ln -s Makefile.x64 Makefile
+               cd lib ; ln -s Makefile.x64 Makefile
+               ;;
+       'clean')
+               rm -f Makefile lib/Makefile
+               ;;
+       *)
+               echo "Usage: configure.sh <target>"
+               echo "Available targets are: x86 x64 clean"
+               ;;
+esac

Deleted: trunk/cinvoke/lib/Makefile
===================================================================
--- trunk/cinvoke/lib/Makefile  2006-07-04 16:07:24 UTC (rev 71)
+++ trunk/cinvoke/lib/Makefile  2006-07-05 23:44:56 UTC (rev 72)
@@ -1,5 +0,0 @@
-default:
-       echo "Use make from top-level directory"
-
-clean:
-       rm -f *.o arch/*.o libcinvoke.a

Modified: trunk/cinvoke/lib/Makefile.x64
===================================================================
--- trunk/cinvoke/lib/Makefile.x64      2006-07-04 16:07:24 UTC (rev 71)
+++ trunk/cinvoke/lib/Makefile.x64      2006-07-05 23:44:56 UTC (rev 72)
@@ -2,6 +2,9 @@
 
 all: $(TARGET)
 
+clean:
+       rm -f *.o arch/*.o libcinvoke.a
+
 SRCS = cinvoke.c structure.c hashtable.c arch/gcc_x64_unix.c
 
 OBJS = $(SRCS:.c=.o)

Modified: trunk/cinvoke/lib/Makefile.x86
===================================================================
--- trunk/cinvoke/lib/Makefile.x86      2006-07-04 16:07:24 UTC (rev 71)
+++ trunk/cinvoke/lib/Makefile.x86      2006-07-05 23:44:56 UTC (rev 72)
@@ -2,6 +2,9 @@
 
 all: $(TARGET)
 
+clean:
+       rm -f *.o arch/*.o libcinvoke.a
+
 SRCS = cinvoke.c structure.c hashtable.c arch/gcc_x86_unix.c
 
 OBJS = $(SRCS:.c=.o)

Deleted: trunk/cinvoke/targets.sh
===================================================================
--- trunk/cinvoke/targets.sh    2006-07-04 16:07:24 UTC (rev 71)
+++ trunk/cinvoke/targets.sh    2006-07-05 23:44:56 UTC (rev 72)
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-echo "Please choose a target and enter: make <targetname>"
-echo "Options: x86 x64"

Modified: trunk/cinvoke/tools/libdl.sh
===================================================================
--- trunk/cinvoke/tools/libdl.sh        2006-07-04 16:07:24 UTC (rev 71)
+++ trunk/cinvoke/tools/libdl.sh        2006-07-05 23:44:56 UTC (rev 72)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ -f /lib/libdl.so.2 ]
+if [ -f /lib/libdl.so.2 -o -f /usr/lib/libdl.dylib ]
 then
        echo '-ldl'
 fi