Blob Blame History Raw
diff -up wannier90-2.0.0/src/Makefile.2.sharedlib wannier90-2.0.0/src/Makefile.2
--- wannier90-2.0.0/src/Makefile.2.sharedlib	2013-09-27 12:57:19.000000000 +0300
+++ wannier90-2.0.0/src/Makefile.2	2013-10-15 12:33:52.732150271 +0300
@@ -8,9 +8,9 @@ OBJS  =  constants.o io.o utility.o para
 
 OBJS2  =  wannier_lib.o
 
-OBJS_POST  = parameters.o kmesh.o io.o comms.o utility.o get_oper.o constants.o postw90_common.o wan_ham.o spin.o dos.o berry.o kpath.o kslice.o boltzwann.o geninterp.o
+OBJS_POST  = comms.o get_oper.o postw90_common.o wan_ham.o spin.o dos.o berry.o kpath.o kslice.o boltzwann.o geninterp.o
 
-LIBRARY = ../../libwannier.a
+LIBRARY = ../../libwannier.so
 
 POSTDIR = ../postw90/
 
@@ -39,15 +39,15 @@ serialobjs: $(OBJS)
 ../../w90chk2chk.x: $(OBJS) ../w90chk2chk.F90
 	$(COMPILER) ../w90chk2chk.F90 $(LDOPTS) $(OBJS) $(LIBS) -o ../../w90chk2chk.x
 
-../../wannier90.x: $(OBJS) ../wannier_prog.F90
-	$(COMPILER) ../wannier_prog.F90 $(LDOPTS) $(OBJS) $(LIBS) -o ../../wannier90.x
+../../wannier90.x: $(OBJS) ../wannier_prog.F90 $(LIBRARY)
+	$(COMPILER) ../wannier_prog.F90 $(LDOPTS) -L../.. -lwannier -o ../../wannier90.x
 
 post: POSTOPTS = $(TEMP1)
 post: COMPILER = $(TEMP2)
 post: mpi_test ../../postw90.x
 
-../../postw90.x: $(OBJS_POST) $(POSTDIR)postw90.F90
-	$(COMPILER) $(POSTDIR)postw90.F90 $(POSTOPTS) $(LDOPTS) $(OBJS_POST) $(LIBS) -o ../../postw90.x
+../../postw90.x: $(OBJS_POST) $(POSTDIR)postw90.F90 $(LIBRARY)
+	$(COMPILER) $(POSTDIR)postw90.F90 $(POSTOPTS) $(LDOPTS) $(OBJS_POST) -L../.. -lwannier $(LIBS) -o ../../postw90.x
 
 mpi_test :
 ifeq ($(COMMS),mpi)
@@ -72,7 +72,7 @@ endif
 libs:     $(LIBRARY)
 
 $(LIBRARY): $(OBJS) $(OBJS2) 
-	$(AR) $(ARFLAGS) $(LIBRARY) $(OBJS2) $(OBJS)
+	$(F90) $(FCOPTS) -shared -o $(LIBRARY) $(OBJS2) $(OBJS) $(LIBS)
 
 clean:
 	rm -f *.o *.mod *.MOD *.obj