From 6b73c2cdf802390d37ae64c44953ea28ddd98017 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Fri, 23 Sep 2011 21:01:08 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7009
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/Makefile.lib    | 6 +++++-
 src/Makefile.list   | 6 +++++-
 src/random_park.cpp | 7 ++++---
 src/variable.cpp    | 2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/Makefile.lib b/src/Makefile.lib
index 79e4d56936..10051e1c20 100644
--- a/src/Makefile.lib
+++ b/src/Makefile.lib
@@ -29,7 +29,11 @@ clean:
 	@if [ ! -d Obj_$@ ]; then mkdir Obj_$@; fi
 	@cp -p $(SRC) $(INC) Obj_$@
 	@cp MAKE/Makefile.$@ Obj_$@/Makefile
-	@cp Makefile.package Obj_$@
+	@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)" lib
 	@if [ -d Obj_$@ ]; then cd Obj_$@; rm -f $(SRC) $(INC) Makefile*; fi
diff --git a/src/Makefile.list b/src/Makefile.list
index fe4b0a96c8..5f755f6ecd 100644
--- a/src/Makefile.list
+++ b/src/Makefile.list
@@ -29,7 +29,11 @@ clean:
 	@if [ ! -d Obj_$@ ]; then mkdir Obj_$@; fi
 	@cp -p $(SRC) $(INC) Obj_$@
 	@cp MAKE/Makefile.$@ Obj_$@/Makefile
-	@cp Makefile.package Obj_$@
+	@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)
 	@if [ -d Obj_$@ ]; then cd Obj_$@; rm -f $(SRC) $(INC) Makefile*; fi
diff --git a/src/random_park.cpp b/src/random_park.cpp
index 456020ff25..6867a61a56 100644
--- a/src/random_park.cpp
+++ b/src/random_park.cpp
@@ -15,7 +15,6 @@
 
 #include "math.h"
 #include "random_park.h"
-#include "domain.h"
 #include "error.h"
 
 using namespace LAMMPS_NS;
@@ -40,7 +39,8 @@ using namespace LAMMPS_NS;
 
 RanPark::RanPark(LAMMPS *lmp, int seed_init) : Pointers(lmp)
 {
-  if (seed_init <= 0) error->all(FLERR,"Invalid seed for Park random # generator");
+  if (seed_init <= 0)
+    error->all(FLERR,"Invalid seed for Park random # generator");
   seed = seed_init;
   save = 0;
 }
@@ -89,7 +89,8 @@ double RanPark::gaussian()
 
 void RanPark::reset(int seed_init)
 {
-  if (seed_init <= 0) error->all(FLERR,"Invalid seed for Park random # generator");
+  if (seed_init <= 0)
+    error->all(FLERR,"Invalid seed for Park random # generator");
   seed = seed_init;
   save = 0;
 }
diff --git a/src/variable.cpp b/src/variable.cpp
index cab825ff4a..a884455137 100644
--- a/src/variable.cpp
+++ b/src/variable.cpp
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------
-  LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
+   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
    http://lammps.sandia.gov, Sandia National Laboratories
    Steve Plimpton, sjplimp@sandia.gov