cinvoke-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: will
Subject: [cinvoke-svn] r18 - in trunk/cinvoke: . lib lib/arch test
Date: 14 Jun 2006 22:38:05 -0400

Author: will
Date: 2006-06-14 22:38:05 -0400 (Wed, 14 Jun 2006)
New Revision: 18

Modified:
   trunk/cinvoke/Makefile
   trunk/cinvoke/lib/Makefile
   trunk/cinvoke/lib/arch/gcc_x86_linux.c
   trunk/cinvoke/lib/cinvoke-arch.h
   trunk/cinvoke/test/Makefile
Log:
changed filenames to make it easier to install


Modified: trunk/cinvoke/Makefile
===================================================================
--- trunk/cinvoke/Makefile      2006-06-14 14:35:34 UTC (rev 17)
+++ trunk/cinvoke/Makefile      2006-06-15 02:38:05 UTC (rev 18)
@@ -1,3 +1,5 @@
+PREFIX = /usr
+
 all:
        cd lib && $(MAKE)
        cd test && $(MAKE)
@@ -2,2 +4,6 @@
 
+install: all
+       install lib/cinvoke.h lib/cinvoke-arch.h lib/cinvoke-archspec.h 
$(PREFIX)/include
+       install lib/cinvoke.a $(PREFIX)/lib
+
 clean:

Modified: trunk/cinvoke/lib/Makefile
===================================================================
--- trunk/cinvoke/lib/Makefile  2006-06-14 14:35:34 UTC (rev 17)
+++ trunk/cinvoke/lib/Makefile  2006-06-15 02:38:05 UTC (rev 18)
@@ -3,12 +3,15 @@
 all: $(TARGET)
 
 clean:
-       rm -f *.o arch/*.o $(TARGET)
+       rm -f *.o $(TARGET)
 
-ARCH_SRCS = arch/gcc_x86_linux.c
+cinvoke-archspec.c: arch/gcc_x86_linux.c
+       cp -f arch/gcc_x86_linux.c cinvoke-archspec.c
+cinvoke-archspec.h: arch/gcc_x86_linux.h
+       cp -f arch/gcc_x86_linux.h cinvoke-archspec.h
+       
+SRCS = cinvoke.c structure.c hashtable.c cinvoke-archspec.c
 
-SRCS = cinvoke.c structure.c hashtable.c $(ARCH_SRCS)
-
 OBJS = $(SRCS:.c=.o)
 
 $(TARGET): $(OBJS)
@@ -17,13 +20,12 @@
        ranlib $(TARGET)
 
 .c.o:
-       gcc -g -Wall -Werror -DARCH_GCC_X86_LINUX -c $< -o $@
+       gcc -g -Wall -Werror -c $< -o $@
 
-cinvoke.o: cinvoke.c cinvoke.h cinvoke-arch.h arch/gcc_x86_linux.h \
-  hashtable.h cinvoke-private.h
-structure.o: structure.c cinvoke.h cinvoke-arch.h arch/gcc_x86_linux.h \
-  hashtable.h cinvoke-private.h
+cinvoke-archspec.o: cinvoke-archspec.c cinvoke.h cinvoke-arch.h \
+  cinvoke-archspec.h cinvoke-private.h hashtable.h
+cinvoke.o: cinvoke.c cinvoke.h cinvoke-arch.h cinvoke-archspec.h \
+  cinvoke-private.h hashtable.h
 hashtable.o: hashtable.c hashtable.h
-arch/gcc_x86_linux.o: arch/gcc_x86_linux.c arch/../cinvoke.h \
-  arch/../cinvoke-arch.h arch/../arch/gcc_x86_linux.h arch/../hashtable.h \
-  arch/../cinvoke-private.h
+structure.o: structure.c cinvoke.h cinvoke-arch.h cinvoke-archspec.h \
+  cinvoke-private.h hashtable.h

Modified: trunk/cinvoke/lib/arch/gcc_x86_linux.c
===================================================================
--- trunk/cinvoke/lib/arch/gcc_x86_linux.c      2006-06-14 14:35:34 UTC (rev 17)
+++ trunk/cinvoke/lib/arch/gcc_x86_linux.c      2006-06-15 02:38:05 UTC (rev 18)
@@ -25,8 +25,8 @@
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 */
-#include "../cinvoke.h"
-#include "../cinvoke-private.h"
+#include "cinvoke.h"
+#include "cinvoke-private.h"
 
 #include <dlfcn.h>
 #include <errno.h>

Modified: trunk/cinvoke/lib/cinvoke-arch.h
===================================================================
--- trunk/cinvoke/lib/cinvoke-arch.h    2006-06-14 14:35:34 UTC (rev 17)
+++ trunk/cinvoke/lib/cinvoke-arch.h    2006-06-15 02:38:05 UTC (rev 18)
@@ -62,12 +62,7 @@
        CINV_CC_FASTCALL /**< Yet another, rarely used, Windows calling 
convention */
 } cinv_callconv_t;
 
-#ifdef ARCH_GCC_X86_LINUX
-#include "arch/gcc_x86_linux.h"
-#endif
-#ifdef ARCH_CL_X86_WIN
-#include "arch/cl_x86_win.h"
-#endif
+#include "cinvoke-archspec.h"
 
 typedef struct _CInvContext {
        cinv_int32_t errorcode;

Modified: trunk/cinvoke/test/Makefile
===================================================================
--- trunk/cinvoke/test/Makefile 2006-06-14 14:35:34 UTC (rev 17)
+++ trunk/cinvoke/test/Makefile 2006-06-15 02:38:05 UTC (rev 18)
@@ -7,4 +7,4 @@
        gcc -g -shared -fPIC lib.c -o lib.so -Wall -Werror
 
 runtests: runtests.c lib.so
-       gcc -g -o runtests -DARCH_GCC_X86_LINUX runtests.c -Wall -Werror 
../lib/cinvoke.a -I../lib -ldl -lm
+       gcc -g -o runtests runtests.c -Wall -Werror ../lib/cinvoke.a -I../lib 
-ldl -lm





reply via email to

[Prev in Thread] Current Thread [Next in Thread]