111 lines
2.9 KiB
Text
111 lines
2.9 KiB
Text
|
diff -ruN ParMetis-3.1.1_orig/METISLib/Makefile ParMetis-3.1.1/METISLib/Makefile
|
||
|
|
--- ParMetis-3.1.1_orig/METISLib/Makefile 2007-03-19 13:46:34.000000000 -0400
|
||
|
|
+++ ParMetis-3.1.1/METISLib/Makefile 2011-12-24 15:06:49.000000000 -0500
|
||
|
|
@@ -19,7 +19,7 @@
|
||
|
|
.c.o:
|
||
|
|
$(CC) $(CFLAGS) -c $*.c
|
||
|
|
|
||
|
|
-../libmetis.a: $(OBJS)
|
||
|
|
+libmetis-parmetis.$(LIB_EXT): $(OBJS)
|
||
|
|
$(AR) $@ $(OBJS)
|
||
|
|
$(RANLIB) $@
|
||
|
|
|
||
|
|
@@ -27,7 +27,7 @@
|
||
|
|
rm -f *.o
|
||
|
|
|
||
|
|
realclean:
|
||
|
|
- rm -f *.o ; rm -f ../libmetis.a
|
||
|
|
+ rm -f *.o ; rm -f libmetis-parmetis.$(LIB_EXT)
|
||
|
|
|
||
|
|
|
||
|
|
checkin:
|
||
|
|
diff -ruN ParMetis-3.1.1_orig/Makefile.in ParMetis-3.1.1/Makefile.in
|
||
|
|
--- ParMetis-3.1.1_orig/Makefile.in 2008-11-17 18:47:06.000000000 -0500
|
||
|
|
+++ ParMetis-3.1.1/Makefile.in 2011-12-24 15:06:49.000000000 -0500
|
||
|
|
@@ -10,7 +10,7 @@
|
||
|
|
INCDIR =
|
||
|
|
|
||
|
|
# What options to be used by the compiler
|
||
|
|
-COPTIONS = -DNDEBUG
|
||
|
|
+COPTIONS = -DNDEBUG -fPIC
|
||
|
|
|
||
|
|
# Which loader to use
|
||
|
|
LD = $(CC)
|
||
|
|
@@ -22,11 +22,14 @@
|
||
|
|
#XTRALIBS = -lefence
|
||
|
|
#XTRALIBS = -ldmalloc
|
||
|
|
|
||
|
|
+# Dynamic lib extension
|
||
|
|
+LIB_EXT = dylib
|
||
|
|
+
|
||
|
|
# What archiving to use
|
||
|
|
-AR = ar rv
|
||
|
|
+AR = gcc -dynamiclib -undefined dynamic_lookup -shared -o
|
||
|
|
|
||
|
|
# What to use for indexing the archive
|
||
|
|
#RANLIB = ranlib
|
||
|
|
-RANLIB = ar -ts
|
||
|
|
+RANLIB = true
|
||
|
|
|
||
|
|
VERNUM =
|
||
|
|
diff -ruN ParMetis-3.1.1_orig/ParMETISLib/Makefile ParMetis-3.1.1/ParMETISLib/Makefile
|
||
|
|
--- ParMetis-3.1.1_orig/ParMETISLib/Makefile 2008-11-17 17:43:23.000000000 -0500
|
||
|
|
+++ ParMetis-3.1.1/ParMETISLib/Makefile 2011-12-24 15:06:49.000000000 -0500
|
||
|
|
@@ -22,7 +22,7 @@
|
||
|
|
$(CC) $(CFLAGS) -c $*.c
|
||
|
|
|
||
|
|
|
||
|
|
-../libparmetis.a: $(OBJS)
|
||
|
|
+libparmetis.$(LIB_EXT): $(OBJS)
|
||
|
|
$(AR) $@ $(OBJS)
|
||
|
|
$(RANLIB) $@
|
||
|
|
|
||
|
|
@@ -30,7 +30,7 @@
|
||
|
|
rm -f *.o
|
||
|
|
|
||
|
|
realclean:
|
||
|
|
- rm -f *.o ; rm -f ../libparmetis.a
|
||
|
|
+ rm -f *.o ; rm -f ./libparmetis.$(LIB_EXT)
|
||
|
|
|
||
|
|
|
||
|
|
checkin:
|
||
|
|
diff -ruN ParMetis-3.1.1_orig/ParMETISLib/stdheaders.h ParMetis-3.1.1/ParMETISLib/stdheaders.h
|
||
|
|
--- ParMetis-3.1.1_orig/ParMETISLib/stdheaders.h 2008-09-16 17:39:19.000000000 -0400
|
||
|
|
+++ ParMetis-3.1.1/ParMETISLib/stdheaders.h 2011-12-24 15:07:42.000000000 -0500
|
||
|
|
@@ -13,8 +13,11 @@
|
||
|
|
|
||
|
|
|
||
|
|
#include <stdio.h>
|
||
|
|
+#ifdef __STDC__
|
||
|
|
#include <stdlib.h>
|
||
|
|
+#else
|
||
|
|
#include <malloc.h>
|
||
|
|
+#endif
|
||
|
|
#include <string.h>
|
||
|
|
#include <ctype.h>
|
||
|
|
#include <math.h>
|
||
|
|
diff -ruN ParMetis-3.1.1_orig/Programs/Makefile ParMetis-3.1.1/Programs/Makefile
|
||
|
|
--- ParMetis-3.1.1_orig/Programs/Makefile 2008-11-17 18:47:06.000000000 -0500
|
||
|
|
+++ ParMetis-3.1.1/Programs/Makefile 2011-12-24 15:06:49.000000000 -0500
|
||
|
|
@@ -6,9 +6,9 @@
|
||
|
|
CFLAGS = $(COPTIONS) $(OPTFLAGS) $(INCLUDES)
|
||
|
|
|
||
|
|
|
||
|
|
-LIBSDIR = -L.. $(LIBDIR)
|
||
|
|
-LIBS = -lparmetis -lmetis $(XTRALIBS) -lm
|
||
|
|
-PARMETISLIB = ../libparmetis.a ../libmetis.a
|
||
|
|
+LIBSDIR = -L../METISLib -L../ParMETISLib $(LIBDIR)
|
||
|
|
+LIBS = -lparmetis -lmetis-parmetis $(XTRALIBS) -lm
|
||
|
|
+PARMETISLIB = ../ParMETISLib/libparmetis.$(LIB_EXT) ../METISLib/libmetis-parmetis.$(LIB_EXT)
|
||
|
|
|
||
|
|
|
||
|
|
PTESTOBJS = ptest.o io.o adaptgraph.o
|
||
|
|
@@ -16,7 +16,6 @@
|
||
|
|
PARMETISOBJS = parmetis.o io.o adaptgraph.o
|
||
|
|
POMETISOBJS = pometis.o io.o
|
||
|
|
|
||
|
|
-
|
||
|
|
.c.o:
|
||
|
|
$(CC) $(CFLAGS) -c $*.c
|
||
|
|
|