From c5bed9973d6254ed0d1468bcc94ad6515b9d4eab Mon Sep 17 00:00:00 2001 From: Reid Townson Date: Fri, 31 Jan 2020 09:24:47 -0500 Subject: [PATCH] Fix makefiles to compile new geometries on Windows Use makefile macros for the make and remove commands, because these are named differently on Windows. --- HEN_HOUSE/egs++/geometry/egs_autoenvelope/Makefile | 4 ++-- HEN_HOUSE/egs++/geometry/egs_glib/Makefile | 6 +++--- HEN_HOUSE/egs++/geometry/egs_rz/Makefile | 9 ++++----- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/HEN_HOUSE/egs++/geometry/egs_autoenvelope/Makefile b/HEN_HOUSE/egs++/geometry/egs_autoenvelope/Makefile index 4f92b6dbe..4e5c51a88 100644 --- a/HEN_HOUSE/egs++/geometry/egs_autoenvelope/Makefile +++ b/HEN_HOUSE/egs++/geometry/egs_autoenvelope/Makefile @@ -76,9 +76,9 @@ $(ABS_DSO)$(libpre)egs_autoenvelope$(libext): volcor.h $(GZSTREAM_H) \ ..$(DSEP)egs_gtransformed$(DSEP)egs_gtransformed.h clean: - rm -f $(ABS_DSO)$(libpre)egs_autoenvelope$(libext) $(ABS_DSO)$(libpre)egs_sobol$(libext) $(ABS_DSO)$(libpre)sobol$(libext) \ + $(REMOVE) $(ABS_DSO)$(libpre)egs_autoenvelope$(libext) $(ABS_DSO)$(libpre)egs_sobol$(libext) $(ABS_DSO)$(libpre)sobol$(libext) \ $(ABS_DSO)$(libpre)gzstream$(libext) $(ABS_DSO)$(libpre)gzstream$(libext) - rm -f $(DSO2)autoenvelope.$(obje) $(DSO2)sobol.$(obje) $(DSO2)egs_sobol.$(obje) \ + $(REMOVE) $(DSO2)autoenvelope.$(obje) $(DSO2)sobol.$(obje) $(DSO2)egs_sobol.$(obje) \ $(DSO2)gzstream.$(obje) $(DSO2)gzstream.$(obje) \ touchup: diff --git a/HEN_HOUSE/egs++/geometry/egs_glib/Makefile b/HEN_HOUSE/egs++/geometry/egs_glib/Makefile index dc6dfba04..07357b86a 100644 --- a/HEN_HOUSE/egs++/geometry/egs_glib/Makefile +++ b/HEN_HOUSE/egs++/geometry/egs_glib/Makefile @@ -52,8 +52,8 @@ $(DSO2)$(library).$(obje): ndgeom $(ABS_DSO)$(libpre)$(library)$(libext): ndgeom ndgeom: - cd ..$(DSEP)egs_nd_geometry && make + cd ..$(DSEP)egs_nd_geometry && $(MAKE) clean: - rm -f $(ABS_DSO)$(libpre)$(library)$(libext) - rm -f $(DSO2)$(library).$(obje) + $(REMOVE) $(ABS_DSO)$(libpre)$(library)$(libext) $(DSO2)$(library).$(obje) + diff --git a/HEN_HOUSE/egs++/geometry/egs_rz/Makefile b/HEN_HOUSE/egs++/geometry/egs_rz/Makefile index 85b7d61cf..d276df292 100644 --- a/HEN_HOUSE/egs++/geometry/egs_rz/Makefile +++ b/HEN_HOUSE/egs++/geometry/egs_rz/Makefile @@ -52,14 +52,13 @@ $(DSO2)$(library).$(obje): ndgeom cyls planes $(ABS_DSO)$(libpre)$(library)$(libext): ndgeom cyls planes ndgeom: - cd ..$(DSEP)egs_nd_geometry && make + cd ..$(DSEP)egs_nd_geometry && $(MAKE) cyls: - cd ..$(DSEP)egs_cylinders && make + cd ..$(DSEP)egs_cylinders && $(MAKE) planes: - cd ..$(DSEP)egs_planes && make + cd ..$(DSEP)egs_planes && $(MAKE) clean: - rm -f $(ABS_DSO)$(libpre)$(library)$(libext) - rm -f $(DSO2)$(library).$(obje) + $(REMOVE) $(ABS_DSO)$(libpre)$(library)$(libext) $(DSO2)$(library).$(obje)