Commit 0d445841 authored by Mark Olesen's avatar Mark Olesen
Browse files

ENH: rationalize wmake rules to avoid unnecessary duplication

- main mplib rules located in GENERAL_RULES with specializations
  (if any) under RULES. Modest change in a few options files, but
  cleans up the rules directories.

  previously in options:
      include $(RULES)/mplib$(WM_MPLIB)

  now in options:
      sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
      sinclude $(RULES)/mplib$(WM_MPLIB)

  For GNU make it would be permissible to write both in a single line.
parent 4d2a297a
include $(RULES)/mplib$(WM_MPLIB)
sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
sinclude $(RULES)/mplib$(WM_MPLIB)
EXE_INC = $(PFLAGS) $(PINC)
EXE_INC = $(PFLAGS) $(PINC)
LIB_LIBS = $(PLIBS)
include $(RULES)/mplib$(WM_MPLIB)
sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
sinclude $(RULES)/mplib$(WM_MPLIB)
EXE_INC = $(PFLAGS) $(PINC)
EXE_INC = $(PFLAGS) $(PINC)
LIB_LIBS = $(PLIBS)
include $(RULES)/mplib$(WM_MPLIB)
sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
sinclude $(RULES)/mplib$(WM_MPLIB)
EXE_INC = \
$(PFLAGS) $(PINC) \
......
......@@ -58,7 +58,7 @@ IFILES = $(WM_OPTIONS)/includeDeps
allFiles : $(FILES) $(SFILES) $(OFILES) $(DFILES) $(IFILES)
$(FILES) : files
@$(CPP) $(GFLAGS) $(FFLAGS) files > $(FILES)
@$(CPP) $(GFLAGS) $(FFLAGS) files | sed -e 's@ *@ @g' > $(FILES)
$(SFILES): files
@$(WM_SCRIPTS)/makeDerivedFiles
......
......@@ -48,7 +48,7 @@ OPTIONS = $(WM_OPTIONS)/options
#------------------------------------------------------------------------------
$(OPTIONS) : options
@$(WM_SCRIPTS)/makeDir $(WM_OPTIONS) ; $(CPP) $(GFLAGS) options > $(OPTIONS)
@$(WM_SCRIPTS)/makeDir $(WM_OPTIONS) ; $(CPP) $(GFLAGS) options | sed -e 's@ *@ @g' > $(OPTIONS)
#------------------------------------------------------------------------------
......@@ -9,3 +9,5 @@ include $(GENERAL_RULES)/coco-cpp
## include $(GENERAL_RULES)/btyacc++
include $(GENERAL_RULES)/bison
include $(GENERAL_RULES)/moc
include $(GENERAL_RULES)/X
../General/mplib
\ No newline at end of file
../General/mplibSYSTEMOPENMPI
\ No newline at end of file
../General/mplib
\ No newline at end of file
../General/mplibOPENMPI
\ No newline at end of file
../General/mplibSYSTEMOPENMPI
\ No newline at end of file
../General/X
\ No newline at end of file
......@@ -2,6 +2,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++
../General/mplib
\ No newline at end of file
../General/mplibGAMMA
\ No newline at end of file
../General/mplibMPICH
\ No newline at end of file
../General/mplibMPICH-GM
\ No newline at end of file
../General/mplibOPENMPI
\ No newline at end of file
../General/mplibQSMPI
\ No newline at end of file
../General/mplibSYSTEMOPENMPI
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment