ENH: link to general mplib* rules where possible.

ENH: generalize rule for X11 ENH: Avoid move in flex/flex++ rule.

ENH: link to general mplib* rules where possible.
ENH: generalize rule for X11 ENH: Avoid move in flex/flex++ rule.
0b9e5ea1 · Mark Olesen · 46d96dc8 · 0b9e5ea1 · 0b9e5ea1 · 0b9e5ea1
Commit 0b9e5ea1 authored Mar 26, 2010 by Mark Olesen
--- a/wmake/rules/General/X
+++ b/wmake/rules/General/X
+# X11 includes and libraries in the standard location
+#
+XFLAGS     =
+XINC       = $(XFLAGS) -I/usr/include/X11
+XLIBS      = -lXext -lX11
--- a/wmake/rules/General/flex
+++ b/wmake/rules/General/flex
 .SUFFIXES: .l

-ltoo = flex $$SOURCE ; mv lex.yy.c $*.c ; $(cc) $(cFLAGS) -c $*.c -o $@ 
+ltoo = flex -o $*.c $$SOURCE ; $(cc) $(cFLAGS) -c $*.c -o $@

 .l.dep:
 	$(MAKE_DEP)
--- a/wmake/rules/General/flex++
+++ b/wmake/rules/General/flex++
 .SUFFIXES: .L

-Ltoo = flex -+ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@
+Ltoo = flex -+ -o $*.C -f $$SOURCE ; $(CC) $(c++FLAGS) -c $*.C -o $@

 .L.dep:
 	$(MAKE_DEP)
--- a/wmake/rules/General/flex++.test
+++ b/wmake/rules/General/flex++.test
-.SUFFIXES: .L
-
-Ltoo = flex++ $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ 
-
-.L.dep:
-	$(MAKE_DEP)
--- a/wmake/rules/linux64Gcc42/mplib
+++ b/wmake/rules/linux64Gcc42/mplib
--- a/wmake/rules/linux64Gcc42/mplibGAMMA
+++ b/wmake/rules/linux64Gcc42/mplibGAMMA
--- a/wmake/rules/General/mplibMPICH
+++ b/wmake/rules/General/mplibMPICH
-PFLAGS     = 
+PFLAGS     = -DMPICH_SKIP_MPICXX
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
--- a/wmake/rules/linux64Gcc42/mplibMPICH-GM
+++ b/wmake/rules/linux64Gcc42/mplibMPICH-GM
--- a/wmake/rules/linux64Gcc42/mplibOPENMPI
+++ b/wmake/rules/linux64Gcc42/mplibOPENMPI
-PFLAGS     = -DOMPI_SKIP_MPICXX
+PFLAGS     =
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
+
--- a/wmake/rules/SiCortex64Gcc/flex++
+++ b/wmake/rules/SiCortex64Gcc/flex++
 .SUFFIXES: .L

-Ltoo = flex --c++ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ 
+Ltoo = flex --c++ -o $*.C -f $$SOURCE ; $(CC) $(c++FLAGS) -c $*.C -o $@

 .L.dep:
 	$(MAKE_DEP)
--- a/wmake/rules/SiCortex64Gcc/mplib
+++ b/wmake/rules/SiCortex64Gcc/mplib
-PFLAGS     =
-PINC       =
-PLIBS      =
--- a/wmake/rules/SiCortex64Gcc/mplib
+++ b/wmake/rules/SiCortex64Gcc/mplib
+../General/mplib
\ No newline at end of file
--- a/wmake/rules/SunOS64Gcc/mplib
+++ b/wmake/rules/SunOS64Gcc/mplib
-PFLAGS     = 
-PINC       = 
-PLIBS      = 
--- a/wmake/rules/SunOS64Gcc/mplib
+++ b/wmake/rules/SunOS64Gcc/mplib
+../General/mplib
\ No newline at end of file
--- a/wmake/rules/SunOS64Gcc/mplibOPENMPI
+++ b/wmake/rules/SunOS64Gcc/mplibOPENMPI
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
--- a/wmake/rules/SunOS64Gcc/mplibOPENMPI
+++ b/wmake/rules/SunOS64Gcc/mplibOPENMPI
+../General/mplibOPENMPI
\ No newline at end of file
--- a/wmake/rules/linux64Gcc/X
+++ b/wmake/rules/linux64Gcc/X
-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/include/X11
-XLIBS      = -L/usr/lib64 -lXext -lX11
--- a/wmake/rules/linux64Gcc/X
+++ b/wmake/rules/linux64Gcc/X
+../General/X
\ No newline at end of file
--- a/wmake/rules/linux64Gcc/mplib
+++ b/wmake/rules/linux64Gcc/mplib
-PFLAGS     =
-PINC       =
-PLIBS      =
--- a/wmake/rules/linux64Gcc/mplib
+++ b/wmake/rules/linux64Gcc/mplib
+../General/mplib
\ No newline at end of file