ENH: link to general mplib* rules where possible.

ENH: generalize rule for X11

ENH: Avoid move in flex/flex++ rule.

wmake/rules/General/X

+# X11 includes and libraries in the standard location
+#
+XFLAGS     =
+XINC       = $(XFLAGS) -I/usr/include/X11
+XLIBS      = -lXext -lX11

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)

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)

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)

wmake/rules/General/mplibMPICH

-PFLAGS     = 
+PFLAGS     = -DMPICH_SKIP_MPICXX
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

wmake/rules/linux64Gcc42/mplibOPENMPI → wmake/rules/General/mplibQSMPI

-PFLAGS     = -DOMPI_SKIP_MPICXX
+PFLAGS     =
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
+

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)

wmake/rules/SiCortex64Gcc/mplib

-PFLAGS     =
-PINC       =
-PLIBS      =

wmake/rules/SiCortex64Gcc/mplib

+../General/mplib
\ No newline at end of file

wmake/rules/SunOS64Gcc/mplib

-PFLAGS     = 
-PINC       = 
-PLIBS      = 

wmake/rules/SunOS64Gcc/mplib

+../General/mplib
\ No newline at end of file

wmake/rules/SunOS64Gcc/mplibOPENMPI

-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi

wmake/rules/SunOS64Gcc/mplibOPENMPI

+../General/mplibOPENMPI
\ No newline at end of file

wmake/rules/linux64Gcc/X

-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/include/X11
-XLIBS      = -L/usr/lib64 -lXext -lX11

wmake/rules/linux64Gcc/X

+../General/X
\ No newline at end of file

wmake/rules/linux64Gcc/mplib

-PFLAGS     =
-PINC       =
-PLIBS      =

wmake/rules/linux64Gcc/mplib

+../General/mplib
\ No newline at end of file