oasis3 (3.3.beta.dfsg.1-5) debian-changes-3.3.beta.dfsg.1-3

Summary

 src/lib/anaisg/src/Makefile                    |    2 -
 src/lib/clim/src/Makefile                      |    3 +-
 src/mod/oasis3/src/Makefile                    |   28 +++++++++++++++++++++----
 src/mod/oasis3/util/make_dir/TopMakefileOasis3 |    6 +++++
 4 files changed, 33 insertions(+), 6 deletions(-)

    
download this patch

Patch contents

Description: Upstream changes introduced in version 3.3.beta.dfsg.1-3
 This patch has been created by dpkg-source during the package build.
 Here's the last changelog entry, hopefully it gives details on why
 those changes were made:
 .
 oasis3 (3.3.beta.dfsg.1-3) unstable; urgency=low
 .
   * non-experimental release.
   * Added non-conservative SCRIP patch from upstream.
   * Add shared-library liboasis3, needed to link shared lib clim*, etc.
   * libanaism, libanaisg also shipped.
   * Provide pkg-config files for clim, psmile, scrip and mpp_io libs.
 .
 The person named in the Author field signed this changelog entry.
Author: Alastair McKinstry <mckinstry@debian.org>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- oasis3-3.3.beta.dfsg.1.orig/src/lib/anaisg/src/Makefile
+++ oasis3-3.3.beta.dfsg.1/src/lib/anaisg/src/Makefile
@@ -5,7 +5,7 @@ OBJS4 	= $(patsubst $(PRISMHOME)/src/lib
 VPATH 	= $(PRISMHOME)/src/lib/anaisg/src:$(PRISMHOME)/src/mod/$(COUPLE)/src
 
 LIBRARY	= $(ARCHDIR)/lib/libanaisg.a
-SHLIB   = $(ARCHDIR)/lib/libanaisg.${CHAN}.${SOEXT}
+SHLIB   = $(ARCHDIR)/lib/libanaisg.${SOEXT}
 
 clean:
 	rm -f i.* *.o *.mod
--- oasis3-3.3.beta.dfsg.1.orig/src/lib/clim/src/Makefile
+++ oasis3-3.3.beta.dfsg.1/src/lib/clim/src/Makefile
@@ -1,4 +1,3 @@
-include /srv/devel/oasis3/deb-packages/oasis3/oasis3-3.1.dfsg.1//src/mod/oasis3/util/make_dir/make.inc
 
 SRCS1 =  $(shell ls $(PRISMHOME)/src/lib/clim/src/*.F90)
 OBJS1 =  $(patsubst $(PRISMHOME)/src/lib/clim/src/%.F90, %.o, $(SRCS1))
@@ -60,3 +59,5 @@ CLIM_Quit.o: mod_clim.o mod_comclim.o mo
 CLIM_Start.o: mod_clim.o mod_comclim.o mod_kinds_oasis.o
 CLIM_Start_MPI.o: mod_clim.o mod_comclim.o mod_kinds_oasis.o
 CLIM_Stepi.o: mod_clim.o mod_comclim.o mod_kinds_oasis.o
+#halte.o: mod_comclim.o mod_hardware.o mod_unit.o
+halte.o: mod_comclim.o mod_unit.o
--- oasis3-3.3.beta.dfsg.1.orig/src/mod/oasis3/src/Makefile
+++ oasis3-3.3.beta.dfsg.1/src/mod/oasis3/src/Makefile
@@ -1,3 +1,12 @@
+include /srv/devel/oasis3/deb-packages/oasis3/oasis3-3.3.beta.dfsg.1//src/mod/oasis3/util/make_dir/make.inc
+MOD = oasis3
+MAINPRG = couple
+MODEL_DIR=$(MOD)
+EXEC=$(MOD).$(CHAN)
+MODLIB=$(EXEC)
+SRC=src
+DEPLIBS=$(ARCHDIR)/lib/libanaisg.a $(ARCHDIR)/lib/libanaism.a $(ARCHDIR)/lib/libfscint.a $(ARCHDIR)/lib/libscrip.a $(ARCHDIR)/lib/libclim.MPI1.a
+LIBS=$(ARCHDIR)/lib/$(MOD)/lib$(MOD).$(CHAN).a $(DEPLIBS) $(FLIBS)
 
 # This file is generated automatically
 SRCS1 =	$(shell find $(PRISMHOME)/src/mod/$(MODEL_DIR)/$(strip $(SRC)) -name '*.F90' -print)
@@ -42,7 +51,7 @@ clean:
 
 all: $(PROG)
 
-lib: $(LIBRARY)
+lib: $(if $(SHARED), $(SHLIB), $(LIBRARY))
 
 $(PROG): $(DEPLIBS) $(LIBRARY)
 	$(F90) $(LDFLAGS) -o $@ $(MAINPRG).o $(LIBS) $(LIBS)
@@ -60,6 +69,18 @@ $(LIBRARY): $(OBJS1) $(OBJS2) $(OBJS3) $
 	$(ARCHDIR)/clim.${CHAN}/mod_calendar.o  \
 	$(ARCHDIR)/clim.${CHAN}/mod_label.o
 
+$(SHLIB):  $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5)
+	$(LDSHARED) -o $(SHLIB) *.o \
+	$(LIBBUILD)/clim.${CHAN}/mod_kinds_oasis.o   
+	
+	#$(LIBBUILD)/clim.${CHAN}/mod_timestep.o  \
+	#$(LIBBUILD)/clim.${CHAN}/mod_hardware.o  \
+#$(LIBBUILD)/clim.${CHAN}/mod_parameter.o  \
+	#$(LIBBUILD)/clim.${CHAN}/mod_calendar.o  \
+	#$(LIBBUILD)/clim.${CHAN}/mod_string.o  \
+	#$(LIBBUILD)/clim.${CHAN}/mod_unitncdf.o  \
+	#$(LIBBUILD)/clim.${CHAN}/mod_label.o
+
 .SUFFIXES:
 .SUFFIXES: .o .c .f .F .f90 .F90
 
@@ -109,7 +130,7 @@ alloc_src.o: mod_anais.o mod_analysis.o
 	mod_parallel.o mod_parameter.o mod_pipe.o mod_rainbow.o mod_sipc.o \
 	mod_string.o mod_timestep.o mod_unitncdf.o
 closerst.o: mod_kinds_oasis.o mod_string.o mod_parameter.o mod_unit.o \
-        mod_printing.o mod_unitncdf.o
+		mod_printing.o mod_unitncdf.o
 dealloc.o: mod_parameter.o
 dealloc_src.o: mod_anais.o mod_analysis.o mod_coast.o mod_experiment.o \
 	mod_extrapol.o mod_kinds_oasis.o mod_memory.o mod_nproc.o \
@@ -125,7 +146,7 @@ ferror.o: mod_experiment.o mod_hardware.
 	mod_parameter.o mod_unit.o
 sco_getdim.o: mod_comclim.o mod_parameter.o
 sco_schedule.o: mod_analysis.o mod_string.o mod_parameter.o mod_experiment.o \
-        mod_comclim.o
+		mod_comclim.o
 getfld.o: mod_analysis.o mod_clim.o mod_experiment.o mod_hardware.o \
 	mod_kinds_oasis.o mod_label.o mod_memory.o mod_parameter.o \
 	mod_printing.o mod_sipc.o mod_string.o mod_timestep.o mod_unit.o \
@@ -134,7 +155,6 @@ givfld.o: mod_analysis.o mod_calendar.o
 	mod_hardware.o mod_kinds_oasis.o mod_label.o mod_memory.o \
 	mod_parameter.o mod_printing.o mod_sipc.o mod_string.o mod_timestep.o \
 	mod_unit.o mod_unitncdf.o 
-halte.o: mod_comclim.o mod_hardware.o mod_unit.o
 inicmc.o: mod_analysis.o mod_clim.o mod_clim_def.o mod_comclim.o \
 	mod_experiment.o mod_gauss.o mod_hardware.o mod_kinds_oasis.o \
 	mod_label.o mod_parallel.o mod_parameter.o mod_printing.o \
--- oasis3-3.3.beta.dfsg.1.orig/src/mod/oasis3/util/make_dir/TopMakefileOasis3
+++ oasis3-3.3.beta.dfsg.1/src/mod/oasis3/util/make_dir/TopMakefileOasis3
@@ -40,6 +40,7 @@ makeshlibs:
 	$(MAKEf) makesymlinks SHARED=1
 	$(MAKEf) makemppio  SHARED=1
 	$(MAKEf) makelibs SHARED=1
+	$(MAKEf) makeoasisshlibs
 	$(MAKEf) makepsmile SHARED=1
 #
 oasis3_psmile:
@@ -150,6 +151,11 @@ makeoasis:
 	@echo "=> Compiling OASIS3"
 	(cd $(ARCHDIR)/build/mod/oasis3.$(CHAN); cp -f $(MODSRC)/oasis3/src/Makefile .;\
          $(addvars0) ; $(modifmakefile) ; $(MAKE) all )
+
+makeoasisshlibs:
+	@echo "=> Compiling OASIS3"
+	(cd $(ARCHDIR)/build/mod/oasis3.$(CHAN); cp -f $(MODSRC)/oasis3/src/Makefile .;\
+         $(addvars0) ; $(modifmakefile) ; $(MAKE) lib SHARED=1 )
 #
 # Rules for compiling the toyclim
 #