From 59d4ade4661feeeb1c220b0e343d46e66704872b Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Fri, 26 Aug 2011 16:49:21 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6824
f3b2605a-c512-4ea7-a41b-209d697bcdaa
---
src/Makefile | 16 ++++++----------
src/Package.sh | 11 +----------
2 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index acb35bb08b..aa62fc473d 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -67,11 +67,14 @@ help:
@$(SHELL) Make.sh style
@cp -p *.cpp *.h Obj_$@
@cp MAKE/Makefile.$@ Obj_$@/Makefile
- @if [ ! -e Makefile.package ]; then make package-regenerate; fi
- @if [ ! -e Makefile.package.settings ]; then make package-regenerate; fi
+ @if [ ! -e Makefile.package ]; \
+ then cp Makefile.package.empty Makefile.package; fi
+ @if [ ! -e Makefile.package.settings ]; \
+ then cp Makefile.package.settings.empty Makefile.package.settings; fi
@cp Makefile.package Makefile.package.settings Obj_$@
@cd Obj_$@; \
- $(MAKE) $(MFLAGS) "OBJ = $(OBJ)" "INC = $(INC)" "EXE = ../$(EXE)" ../$(EXE)
+ $(MAKE) $(MFLAGS) "OBJ = $(OBJ)" "INC = $(INC)" \
+ "EXE = ../$(EXE)" ../$(EXE)
@if [ -d Obj_$@ ]; then cd Obj_$@; rm -f $(SRC) $(INC) Makefile*; fi
# Remove machine-specific object files
@@ -171,7 +174,6 @@ no-%:
# status = list src files that differ from package files
# update = replace src files with newer package files
# overwrite = overwrite package files with newer src files
-# regenerate = regenerate Makefile.package from Makefile.package.empty
# diff = show differences between src and package files
package-status:
@@ -189,12 +191,6 @@ package-overwrite:
@echo ''
@for p in $(PACKUSERUC); do $(SHELL) Package.sh $$p overwrite; done
-package-regenerate:
- @cp Makefile.package.empty Makefile.package
- @cp Makefile.package.settings.empty Makefile.package.settings
- @for p in $(PACKAGEUC); do $(SHELL) Package.sh $$p regenerate; done
- @for p in $(PACKUSERUC); do $(SHELL) Package.sh $$p regenerate; done
-
package-diff:
@for p in $(PACKAGEUC); do $(SHELL) Package.sh $$p diff; done
@echo ''
diff --git a/src/Package.sh b/src/Package.sh
index fb3694bb4e..78b7b7a10b 100644
--- a/src/Package.sh
+++ b/src/Package.sh
@@ -1,5 +1,5 @@
# Package.sh = package management, called from Makefile
-# Syntax: sh Package.sh DIR status/update/overwrite/regenerate/diff
+# Syntax: sh Package.sh DIR status/update/overwrite/diff
# style used to translate dir name to package name
@@ -79,15 +79,6 @@ elif (test $2 = "overwrite") then
echo " $1 package is not installed, no action"
fi
-# regenenate Makefile.package from Makefile.package.empty
-# if installed:
-# re-install so Install.sh will edit Makefile.package
-
-elif (test $2 = "regenerate") then
- if (test $installed = 1) then
- /bin/sh Install.sh 1
- fi
-
# diff
# if installed:
# show any differences between src files and package files
--
GitLab