working on R

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8420 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2014-02-04 06:17:09 +00:00
parent 8c44238f16
commit fef36e8218

View File

@ -3,6 +3,7 @@ IDEST=phreeqc/src
DEST=phreeqc/src/phreeqcpp
ISRC=../src
SRC=../src/phreeqcpp
INST=phreeqc/inst
PSRC = \
@ -152,13 +153,21 @@ XSRC = \
$(IDEST)/IPhreeqc.hpp \
$(IDEST)/IPhreeqcLib.cpp \
$(IDEST)/R.cpp \
$(IDEST)/RPhreeqcDat.c \
$(IDEST)/thread.h \
$(IDEST)/Var.c \
$(IDEST)/Var.h \
$(IDEST)/Version.h \
$(IDEST)/Makevars
all: $(PSRC) $(XSRC)
DATA = \
$(INST)/phreeqc.dat \
$(INST)/ex1 \
$(INST)/ex2
all: $(PSRC) $(XSRC) $(DATA)
##$(PSRC): $(DEST)
@ -616,6 +625,16 @@ $(IDEST)/Var.h : $(ISRC)/Var.h
$(IDEST)/Version.h : $(ISRC)/Version.h
$(CP) $< $@
########################################
$(INST)/phreeqc.dat : ../database/phreeqc.dat
$(CP) $< $@
$(INST)/ex1 : ../phreeqc3-examples/ex1
$(CP) $< $@
$(INST)/ex2 : ../phreeqc3-examples/ex2
$(CP) $< $@
########################################
@ -631,6 +650,13 @@ $(IDEST)/Makevars : Makevars
$(IDEST)/R.cpp : R.cpp
$(CP) $< $@
$(IDEST)/RPhreeqcDat.c : ../database/phreeqc.dat
# echo "extern \"C\" {" > $@
echo "const char PHREEQC_DAT[] = " >> $@
sed -e 's/\\/\\\\/g;s/"/\\"/g;s/\t/\\t/g;s/^/"/;s/$$/\\n"/' $< >> $@
echo ";" >> $@
# echo "} // extern \"C\"" >> $@
$(IDEST):
mkdir $(IDEST)
@ -638,4 +664,4 @@ $(DEST):
mkdir $(DEST)
clean :
rm -f $(PSRC) $(ISRC) $(DEST)/*.o $(IDEST)/*.o $(DEST)/*.so
rm -f $(PSRC) $(ISRC) $(DEST)/*.o $(IDEST)/*.o $(DEST)/*.so