diff options
| author | Derrick Hendricks <derrick@nanorex.com> | 2008-09-18 16:52:00 +0000 |
|---|---|---|
| committer | Derrick Hendricks <derrick@nanorex.com> | 2008-09-18 16:52:00 +0000 |
| commit | e4a62649be342fa5e86ea24bf39b728704b11fc3 (patch) | |
| tree | 4535777de3fba263e42f65e1befa558690658356 | |
| parent | 3956f33d281c948f202bd2403153faab938a4ff1 (diff) | |
| download | nanoengineer-theirix-e4a62649be342fa5e86ea24bf39b728704b11fc3.tar.gz nanoengineer-theirix-e4a62649be342fa5e86ea24bf39b728704b11fc3.zip | |
made build changes for new ND1 makefile
| -rwxr-xr-x | packaging/MacOSX/ND1-Makefile | 166 |
1 files changed, 93 insertions, 73 deletions
diff --git a/packaging/MacOSX/ND1-Makefile b/packaging/MacOSX/ND1-Makefile index 6fcfb07c7..c94b69176 100755 --- a/packaging/MacOSX/ND1-Makefile +++ b/packaging/MacOSX/ND1-Makefile @@ -1,6 +1,6 @@ # Makefile for the simulator # Copyright 2004-2007 Nanorex, Inc. See LICENSE file for details. -# $Id: Makefile,v 1.105 2007/05/11 04:41:28 emessick Exp $ +# $Id: Makefile 14229 2008-09-15 17:52:11Z ericmessick $ UNAME := $(shell uname) # PYPATH is left in in case a way to run versus another python is needed @@ -41,8 +41,8 @@ CC=gcc PYREXTARGET=sim.so STDC99=-std=c99 SIMTARGET=simulator -#CFLAGS=-pthread -fno-strict-aliasing -g -I/usr/include/python2.3 -fno-strict-aliasing -Wall -Wmissing-prototypes -Wstrict-prototypes -fPIC -CFLAGS:=$(shell python distutils_compile_options.py compiler_so) +CFLAGS=-pthread -fno-strict-aliasing -g -I/usr/include/python2.3 -fno-strict-aliasing -Wall -Wmissing-prototypes -Wstrict-prototypes -fPIC +#CFLAGS:=$(shell python distutils_compile_options.py compiler_so) ifeq ($(strip $(UNAME)),Darwin) #---------------------------------------- Mac CFLAGS+=-arch i386 -arch ppc -force_cpusubtype_ALL -isysroot /Developer/SDKs/MacOSX10.4u.sdk -I/Library/Frameworks/Python.framework/Versions/$(PYDVER)/lib/python$(PYDVER)/config \ @@ -51,6 +51,7 @@ CFLAGS+=-arch i386 -arch ppc -force_cpusubtype_ALL -isysroot /Developer/SDKs/Mac LDFLAGSDIST= $(shell $(PYPATH)python -c "import sys,os.path;print '-L%s/lib -L%s/lib/python$(PYDVER)/config -lpython%s' % (os.path.normpath(sys.prefix), os.path.normpath(sys.prefix), $(PYDVER))") LDFLAGS=-arch i386 -arch ppc -force_cpusubtype_ALL -isysroot /Developer/SDKs/MacOSX10.4u.sdk $(LDFLAGSDIST) -Wl,-F.,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -framework Python + LDSHARED=gcc -bundle else #---------------------------------------- Unix @@ -72,6 +73,7 @@ endif COMMONOBJS=\ allocate.o \ + amber_patterns.o \ dynamics.o \ globals.o \ hashtable.o \ @@ -94,6 +96,10 @@ COMMONOBJS=\ structcompare.o \ writemovie.o +ifeq ($(OS),Windows_NT) + COMMONOBJS+= strtok_r.o +endif + PYREXSRCS=$(COMMONOBJS:.o=.c) SIMOBJS=$(COMMONOBJS) simulator.o @@ -175,7 +181,7 @@ bends.gen: bend.py bending.parms # optimize. It's getting tripped up by the bend names; if they are all # the same it doesn't get stuck. newtables.o: newtables.c - $(CC) -o newtables.o -arch i386 -arch ppc -c -g newtables.c + $(CC) -o newtables.o $(CFLAGS) -c -g newtables.c version.h: $(PYPATH)python makehelp.py "$(CFLAGS)" "$(LDFLAGS)" "$(UNAME_A)" \ @@ -245,129 +251,143 @@ depends: depend # DO NOT DELETE allocate.o: allocate.h +amber_patterns.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h +amber_patterns.o: minimize.h structcompare.h part.h newtables.h interpolate.h +amber_patterns.o: readmmp.h readxyz.h printers.h dynamics.h jigs.h +amber_patterns.o: amber_patterns.h pam5_patterns.h pattern.h potential.h +amber_patterns.o: minstructure.h writemovie.h rigid.h printGromacsTopology.h +amber_patterns.o: globals.h dynamics.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h minimize.h dynamics.o: structcompare.h part.h newtables.h interpolate.h readmmp.h -dynamics.o: readxyz.h printers.h dynamics.h jigs.h pam5_patterns.h pattern.h -dynamics.o: potential.h minstructure.h writemovie.h rigid.h -dynamics.o: printGromacsTopology.h globals.h +dynamics.o: readxyz.h printers.h dynamics.h jigs.h amber_patterns.h +dynamics.o: pam5_patterns.h pattern.h potential.h minstructure.h writemovie.h +dynamics.o: rigid.h printGromacsTopology.h globals.h globals.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h minimize.h globals.o: structcompare.h part.h newtables.h interpolate.h readmmp.h -globals.o: readxyz.h printers.h dynamics.h jigs.h pam5_patterns.h pattern.h -globals.o: potential.h minstructure.h writemovie.h rigid.h -globals.o: printGromacsTopology.h globals.h +globals.o: readxyz.h printers.h dynamics.h jigs.h amber_patterns.h +globals.o: pam5_patterns.h pattern.h potential.h minstructure.h writemovie.h +globals.o: rigid.h printGromacsTopology.h globals.h glviewer.o: allocate.h hashtable.o: allocate.h hashtable.h interpolate.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h interpolate.o: minimize.h structcompare.h part.h newtables.h interpolate.h interpolate.o: readmmp.h readxyz.h printers.h dynamics.h jigs.h -interpolate.o: pam5_patterns.h pattern.h potential.h minstructure.h -interpolate.o: writemovie.h rigid.h printGromacsTopology.h globals.h +interpolate.o: amber_patterns.h pam5_patterns.h pattern.h potential.h +interpolate.o: minstructure.h writemovie.h rigid.h printGromacsTopology.h +interpolate.o: globals.h jigs.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h minimize.h jigs.o: structcompare.h part.h newtables.h interpolate.h readmmp.h readxyz.h -jigs.o: printers.h dynamics.h jigs.h pam5_patterns.h pattern.h potential.h -jigs.o: minstructure.h writemovie.h rigid.h printGromacsTopology.h globals.h +jigs.o: printers.h dynamics.h jigs.h amber_patterns.h pam5_patterns.h +jigs.o: pattern.h potential.h minstructure.h writemovie.h rigid.h +jigs.o: printGromacsTopology.h globals.h lin-alg.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h minimize.h lin-alg.o: structcompare.h part.h newtables.h interpolate.h readmmp.h -lin-alg.o: readxyz.h printers.h dynamics.h jigs.h pam5_patterns.h pattern.h -lin-alg.o: potential.h minstructure.h writemovie.h rigid.h -lin-alg.o: printGromacsTopology.h globals.h +lin-alg.o: readxyz.h printers.h dynamics.h jigs.h amber_patterns.h +lin-alg.o: pam5_patterns.h pattern.h potential.h minstructure.h writemovie.h +lin-alg.o: rigid.h printGromacsTopology.h globals.h minimize.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h minimize.h minimize.o: structcompare.h part.h newtables.h interpolate.h readmmp.h -minimize.o: readxyz.h printers.h dynamics.h jigs.h pam5_patterns.h pattern.h -minimize.o: potential.h minstructure.h writemovie.h rigid.h -minimize.o: printGromacsTopology.h globals.h +minimize.o: readxyz.h printers.h dynamics.h jigs.h amber_patterns.h +minimize.o: pam5_patterns.h pattern.h potential.h minstructure.h writemovie.h +minimize.o: rigid.h printGromacsTopology.h globals.h minstructure.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h minstructure.o: minimize.h structcompare.h part.h newtables.h interpolate.h minstructure.o: readmmp.h readxyz.h printers.h dynamics.h jigs.h -minstructure.o: pam5_patterns.h pattern.h potential.h minstructure.h -minstructure.o: writemovie.h rigid.h printGromacsTopology.h globals.h +minstructure.o: amber_patterns.h pam5_patterns.h pattern.h potential.h +minstructure.o: minstructure.h writemovie.h rigid.h printGromacsTopology.h +minstructure.o: globals.h newtables.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h minimize.h newtables.o: structcompare.h part.h newtables.h interpolate.h readmmp.h -newtables.o: readxyz.h printers.h dynamics.h jigs.h pam5_patterns.h pattern.h -newtables.o: potential.h minstructure.h writemovie.h rigid.h -newtables.o: printGromacsTopology.h globals.h bonds.gen bends.gen +newtables.o: readxyz.h printers.h dynamics.h jigs.h amber_patterns.h +newtables.o: pam5_patterns.h pattern.h potential.h minstructure.h +newtables.o: writemovie.h rigid.h printGromacsTopology.h globals.h bonds.gen +newtables.o: bends.gen pam5_patterns.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h pam5_patterns.o: minimize.h structcompare.h part.h newtables.h interpolate.h pam5_patterns.o: readmmp.h readxyz.h printers.h dynamics.h jigs.h -pam5_patterns.o: pam5_patterns.h pattern.h potential.h minstructure.h -pam5_patterns.o: writemovie.h rigid.h printGromacsTopology.h globals.h +pam5_patterns.o: amber_patterns.h pam5_patterns.h pattern.h potential.h +pam5_patterns.o: minstructure.h writemovie.h rigid.h printGromacsTopology.h +pam5_patterns.o: globals.h part.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h minimize.h part.o: structcompare.h part.h newtables.h interpolate.h readmmp.h readxyz.h -part.o: printers.h dynamics.h jigs.h pam5_patterns.h pattern.h potential.h -part.o: minstructure.h writemovie.h rigid.h printGromacsTopology.h globals.h +part.o: printers.h dynamics.h jigs.h amber_patterns.h pam5_patterns.h +part.o: pattern.h potential.h minstructure.h writemovie.h rigid.h +part.o: printGromacsTopology.h globals.h pattern.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h minimize.h pattern.o: structcompare.h part.h newtables.h interpolate.h readmmp.h -pattern.o: readxyz.h printers.h dynamics.h jigs.h pam5_patterns.h pattern.h -pattern.o: potential.h minstructure.h writemovie.h rigid.h -pattern.o: printGromacsTopology.h globals.h +pattern.o: readxyz.h printers.h dynamics.h jigs.h amber_patterns.h +pattern.o: pam5_patterns.h pattern.h potential.h minstructure.h writemovie.h +pattern.o: rigid.h printGromacsTopology.h globals.h potential.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h minimize.h potential.o: structcompare.h part.h newtables.h interpolate.h readmmp.h -potential.o: readxyz.h printers.h dynamics.h jigs.h pam5_patterns.h pattern.h -potential.o: potential.h minstructure.h writemovie.h rigid.h -potential.o: printGromacsTopology.h globals.h +potential.o: readxyz.h printers.h dynamics.h jigs.h amber_patterns.h +potential.o: pam5_patterns.h pattern.h potential.h minstructure.h +potential.o: writemovie.h rigid.h printGromacsTopology.h globals.h printers.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h minimize.h printers.o: structcompare.h part.h newtables.h interpolate.h readmmp.h -printers.o: readxyz.h printers.h dynamics.h jigs.h pam5_patterns.h pattern.h -printers.o: potential.h minstructure.h writemovie.h rigid.h -printers.o: printGromacsTopology.h globals.h +printers.o: readxyz.h printers.h dynamics.h jigs.h amber_patterns.h +printers.o: pam5_patterns.h pattern.h potential.h minstructure.h writemovie.h +printers.o: rigid.h printGromacsTopology.h globals.h printGromacsTopology.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h printGromacsTopology.o: minimize.h structcompare.h part.h newtables.h printGromacsTopology.o: interpolate.h readmmp.h readxyz.h printers.h -printGromacsTopology.o: dynamics.h jigs.h pam5_patterns.h pattern.h -printGromacsTopology.o: potential.h minstructure.h writemovie.h rigid.h -printGromacsTopology.o: printGromacsTopology.h globals.h +printGromacsTopology.o: dynamics.h jigs.h amber_patterns.h pam5_patterns.h +printGromacsTopology.o: pattern.h potential.h minstructure.h writemovie.h +printGromacsTopology.o: rigid.h printGromacsTopology.h globals.h readers.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h minimize.h readers.o: structcompare.h part.h newtables.h interpolate.h readmmp.h -readers.o: readxyz.h printers.h dynamics.h jigs.h pam5_patterns.h pattern.h -readers.o: potential.h minstructure.h writemovie.h rigid.h -readers.o: printGromacsTopology.h globals.h +readers.o: readxyz.h printers.h dynamics.h jigs.h amber_patterns.h +readers.o: pam5_patterns.h pattern.h potential.h minstructure.h writemovie.h +readers.o: rigid.h printGromacsTopology.h globals.h readmmp.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h minimize.h readmmp.o: structcompare.h part.h newtables.h interpolate.h readmmp.h -readmmp.o: readxyz.h printers.h dynamics.h jigs.h pam5_patterns.h pattern.h -readmmp.o: potential.h minstructure.h writemovie.h rigid.h -readmmp.o: printGromacsTopology.h globals.h +readmmp.o: readxyz.h printers.h dynamics.h jigs.h amber_patterns.h +readmmp.o: pam5_patterns.h pattern.h potential.h minstructure.h writemovie.h +readmmp.o: rigid.h printGromacsTopology.h globals.h readxyz.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h minimize.h readxyz.o: structcompare.h part.h newtables.h interpolate.h readmmp.h -readxyz.o: readxyz.h printers.h dynamics.h jigs.h pam5_patterns.h pattern.h -readxyz.o: potential.h minstructure.h writemovie.h rigid.h -readxyz.o: printGromacsTopology.h globals.h +readxyz.o: readxyz.h printers.h dynamics.h jigs.h amber_patterns.h +readxyz.o: pam5_patterns.h pattern.h potential.h minstructure.h writemovie.h +readxyz.o: rigid.h printGromacsTopology.h globals.h rigid.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h minimize.h rigid.o: structcompare.h part.h newtables.h interpolate.h readmmp.h readxyz.h -rigid.o: printers.h dynamics.h jigs.h pam5_patterns.h pattern.h potential.h -rigid.o: minstructure.h writemovie.h rigid.h printGromacsTopology.h globals.h -rigid.o: rigid-ode.h +rigid.o: printers.h dynamics.h jigs.h amber_patterns.h pam5_patterns.h +rigid.o: pattern.h potential.h minstructure.h writemovie.h rigid.h +rigid.o: printGromacsTopology.h globals.h rigid-ode.h rigid-ode.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h minimize.h rigid-ode.o: structcompare.h part.h newtables.h interpolate.h readmmp.h -rigid-ode.o: readxyz.h printers.h dynamics.h jigs.h pam5_patterns.h pattern.h -rigid-ode.o: potential.h minstructure.h writemovie.h rigid.h -rigid-ode.o: printGromacsTopology.h globals.h rigid-ode.h +rigid-ode.o: readxyz.h printers.h dynamics.h jigs.h amber_patterns.h +rigid-ode.o: pam5_patterns.h pattern.h potential.h minstructure.h +rigid-ode.o: writemovie.h rigid.h printGromacsTopology.h globals.h +rigid-ode.o: rigid-ode.h sim.o: simhelp.c simulator.h debug.h lin-alg.h allocate.h hashtable.h sim.o: minimize.h structcompare.h part.h newtables.h interpolate.h readmmp.h -sim.o: readxyz.h printers.h dynamics.h jigs.h pam5_patterns.h pattern.h -sim.o: potential.h minstructure.h writemovie.h rigid.h printGromacsTopology.h -sim.o: globals.h version.h +sim.o: readxyz.h printers.h dynamics.h jigs.h amber_patterns.h +sim.o: pam5_patterns.h pattern.h potential.h minstructure.h writemovie.h +sim.o: rigid.h printGromacsTopology.h globals.h version.h simhelp.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h minimize.h simhelp.o: structcompare.h part.h newtables.h interpolate.h readmmp.h -simhelp.o: readxyz.h printers.h dynamics.h jigs.h pam5_patterns.h pattern.h -simhelp.o: potential.h minstructure.h writemovie.h rigid.h -simhelp.o: printGromacsTopology.h globals.h version.h +simhelp.o: readxyz.h printers.h dynamics.h jigs.h amber_patterns.h +simhelp.o: pam5_patterns.h pattern.h potential.h minstructure.h writemovie.h +simhelp.o: rigid.h printGromacsTopology.h globals.h version.h simulator.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h minimize.h simulator.o: structcompare.h part.h newtables.h interpolate.h readmmp.h -simulator.o: readxyz.h printers.h dynamics.h jigs.h pam5_patterns.h pattern.h -simulator.o: potential.h minstructure.h writemovie.h rigid.h -simulator.o: printGromacsTopology.h globals.h version.h +simulator.o: readxyz.h printers.h dynamics.h jigs.h amber_patterns.h +simulator.o: pam5_patterns.h pattern.h potential.h minstructure.h +simulator.o: writemovie.h rigid.h printGromacsTopology.h globals.h version.h simulator.o: debug.h lin-alg.h allocate.h hashtable.h minimize.h simulator.o: structcompare.h part.h newtables.h interpolate.h readmmp.h -simulator.o: readxyz.h printers.h dynamics.h jigs.h pam5_patterns.h pattern.h -simulator.o: potential.h minstructure.h writemovie.h rigid.h -simulator.o: printGromacsTopology.h globals.h +simulator.o: readxyz.h printers.h dynamics.h jigs.h amber_patterns.h +simulator.o: pam5_patterns.h pattern.h potential.h minstructure.h +simulator.o: writemovie.h rigid.h printGromacsTopology.h globals.h structcompare.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h structcompare.o: minimize.h structcompare.h part.h newtables.h interpolate.h structcompare.o: readmmp.h readxyz.h printers.h dynamics.h jigs.h -structcompare.o: pam5_patterns.h pattern.h potential.h minstructure.h -structcompare.o: writemovie.h rigid.h printGromacsTopology.h globals.h +structcompare.o: amber_patterns.h pam5_patterns.h pattern.h potential.h +structcompare.o: minstructure.h writemovie.h rigid.h printGromacsTopology.h +structcompare.o: globals.h writemovie.o: simulator.h debug.h lin-alg.h allocate.h hashtable.h minimize.h writemovie.o: structcompare.h part.h newtables.h interpolate.h readmmp.h -writemovie.o: readxyz.h printers.h dynamics.h jigs.h pam5_patterns.h -writemovie.o: pattern.h potential.h minstructure.h writemovie.h rigid.h -writemovie.o: printGromacsTopology.h globals.h +writemovie.o: readxyz.h printers.h dynamics.h jigs.h amber_patterns.h +writemovie.o: pam5_patterns.h pattern.h potential.h minstructure.h +writemovie.o: writemovie.h rigid.h printGromacsTopology.h globals.h |