[Pkg-scicomp-devel] parmetis/trunk

[Christophe Prud'homme]

SVN commit 488 by prudhomm:

added CPPFLAGS to Makefile(s), updated rules, updated compat, use cdbs

 M  +2 -2      parmetis/trunk/METISLib/Makefile  
 M  +2 -2      parmetis/trunk/ParMETISLib/Makefile  
 M  +3 -3      parmetis/trunk/Programs/Makefile  
 A             parmetis/trunk/debian/compat  
 M  +2 -2      parmetis/trunk/debian/libparmetis-dev.install  
 M  +2 -2      parmetis/trunk/debian/parmetis-test.install  
 M  +6 -0      parmetis/trunk/debian/rules  


--- parmetis/trunk/METISLib/Makefile #487:488
@@ -22,10 +22,10 @@
 SHLOBJS = $(OBJS:.o=.lo)
 
 .c.o:
-	$(CC) $(CFLAGS) -c $*.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c
 
 .c.lo:
-	$(CC) $(CFLAGS) -fPIC -DPIC -c $< -o $@
+	$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -DPIC -c $< -o $@
 
 ../libmetis.a: $(OBJS)
 	$(AR) $@ $(OBJS)
--- parmetis/trunk/ParMETISLib/Makefile #487:488
@@ -24,10 +24,10 @@
 SHLOBJS = $(OBJS:.o=.lo)
 
 .c.o:
-	$(CC) $(CFLAGS) -c $*.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c
 
 .c.lo:
-	$(CC) $(CFLAGS) -fPIC -DPIC -c $< -o $@
+	$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -DPIC -c $< -o $@
 
 ../libparmetis.a: $(OBJS)
 	$(AR) $@ $(OBJS)
--- parmetis/trunk/Programs/Makefile #487:488
@@ -2,8 +2,8 @@
 
 BINDIR = ../Graphs
 
-INCLUDES = -I./ -I../ParMETISLib $(INCDIR) 
-CFLAGS = $(COPTIONS) $(OPTFLAGS) $(INCLUDES)
+#INCLUDES = -I./ -I../ParMETISLib $(INCDIR) 
+#CFLAGS = $(COPTIONS) $(OPTFLAGS) $(INCLUDES)
 
 
 LIBSDIR = -L.. $(LIBDIR) 
@@ -17,7 +17,7 @@
 
           
 .c.o:
-	$(CC) $(CFLAGS) -c $*.c
+	$(CC) -I./ -I../ParMETISLib $(CPPFLAGS) $(CFLAGS) -c $*.c
 
 
 default: $(BINDIR)/ptest$(VERNUM) $(BINDIR)/mtest$(VERNUM) 
--- parmetis/trunk/debian/libparmetis-dev.install #487:488
@@ -1,6 +1,6 @@
 *.h
-metis/*.h /usr/include/metis
-parmetis/*.h /usr/include/parmetis
+METISLib/*.h /usr/include/metis
+ParMETISLib/*.h /usr/include/parmetis
 libmetis.a
 libparmetis.a
 libmetis.so
--- parmetis/trunk/debian/parmetis-test.install #487:488
@@ -1,2 +1,2 @@
-mtest.1 /usr/share/man/man1
-ptest.1 /usr/share/man/man1
\ No newline at end of file
+debian/mtest.1 /usr/share/man/man1
+debian/ptest.1 /usr/share/man/man1
\ No newline at end of file
--- parmetis/trunk/debian/rules #487:488
@@ -23,6 +23,7 @@
 
 DEB_DH_COMPRESS_ARGS := -X pdf
 
+
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 #include /usr/share/cdbs/1/rules/tarball.mk
@@ -30,3 +31,8 @@
 
 INSTALL_PROG=install -D
 INSTALL_DATA=install -m 644 -D
+
+#DEB_MAKE_ENVVARS := 
+CFLAGS=-O3
+CXXFLAGS=-O3
+CPPFLAGS=-I/usr/lib/mpich/include -I.
\ No newline at end of file