abandon libwannier90_extra

_extra previously contained some "extra" functions not intended
for general use; too confusing for users so folded back into
libwannier90

Makefile

@@ -92,7 +92,7 @@ clean:
 	cd $(ROOTDIR)/test-suite && ./clean_tests
 
 veryclean: clean
-	cd $(ROOTDIR) && rm -f wannier90.x postw90.x w90chk2chk.x w90spn2spn.x libwannier90_{mpi,serial}.{a,so.4} libwannier90-extra_{mpi,serial}.{a,so.4}
+	cd $(ROOTDIR) && rm -f wannier90.x postw90.x w90chk2chk.x w90spn2spn.x libwannier90_{mpi,serial}.{a,so.4}
 	cd $(ROOTDIR)/test-suite && ./clean_tests -i
 
 thedoc:

src/Makefile.2

@@ -56,9 +56,6 @@ w90spn2spn: ../../w90spn2spn.x
 $(LIBRARYV2): $(OBJS)
 	$(AR) $(ARFLAGS) $(LIBRARYV2) $(OBJS)
 
-$(LIBRARYV2EXTRA): library_extra.o
-	$(AR) $(ARFLAGS) $(LIBRARYV2EXTRA) library_extra.o
-
 post: POSTOPTS = $(TEMP1)
 post: COMPILER = $(TEMP2)
 post: mpi_test ../../postw90.x

src/Makefile.header

@@ -1,15 +1,15 @@
 ifdef WANNIER90_WITH_C
 OBJS  =  constants.o io.o utility.o types.o hamiltonian.o overlap.o kmesh.o disentangle.o \
         ws_distance.o wannierise.o plot.o transport.o sitesym.o comms.o wannier90_types.o \
-        wannier90_readwrite.o readwrite.o error.o error_base.o library_interface.o c_interface.o
+        wannier90_readwrite.o readwrite.o error.o error_base.o library_interface.o \
+	library_extra.o c_interface.o
 else
 OBJS  =  constants.o io.o utility.o types.o hamiltonian.o overlap.o kmesh.o disentangle.o \
         ws_distance.o wannierise.o plot.o transport.o sitesym.o comms.o wannier90_types.o \
-        wannier90_readwrite.o readwrite.o error.o error_base.o library_interface.o
+        wannier90_readwrite.o readwrite.o error.o error_base.o library_interface.o \
+	library_extra.o
 endif
 
-OBJSEXTRA = library_extra.o
-
 OBJS_POST  = ws_distance.o types.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 gyrotropic.o kpath.o kslice.o \
         boltzwann.o geninterp.o postw90_types.o postw90_readwrite.o readwrite.o \
@@ -39,6 +39,4 @@ endif
 
 DYNLIBBASE = wannier90_$(LIBSUFFIX)
 LIBRARYV2 =       ../../libwannier90_$(LIBSUFFIX).a
-LIBRARYV2EXTRA =  ../../libwannier90-extra_$(LIBSUFFIX).a
 DYNLIBRARY =            libwannier90_$(LIBSUFFIX).so.4
-DYNLIBRARYEXTRA =       libwannier90-extra_$(LIBSUFFIX).so.4

wrap/Makefile

@@ -23,7 +23,7 @@ wrap: $(WRAPSRC)
 	$(F90WRAP) -m $(PYMOD) -k kind_map $(WRAPSRC)
 
 python: cabort.o
-	f2py -c -m _$(PYMOD) $(F90WRAPEXTRA) -I$(BUILD) f90wrap_*.f90 cabort.o -L.. -l$(DYNLIBEXTRABASE) -l$(DYNLIBBASE)
+	f2py -c -m _$(PYMOD) $(F90WRAPEXTRA) -I$(BUILD) f90wrap_*.f90 cabort.o -L.. -l$(DYNLIBBASE)
 
 # I expected this to only be needed for f2py-f90wrap, but seems to be wrong
 cabort.o: cabort.c