use system g2clib on Ubuntu

MennoTammens · Jun 7, 2018 · eaf7c8f · eaf7c8f · norulz · Jun 16, 2018
1 parent af5a0eb
commit eaf7c8f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -43,7 +43,6 @@ XyGrib: $(SRC)
 	@ echo
 	rm -f ./XyGrib
 	cd $(QWTDIR)/src; $(QMAKE); make -j6
-	cd src/g2clib; make
 	cd src; $(QMAKE); make -j6
 	@ echo "-----------------------------------"
 	@ echo "#!/bin/bash" >> ./XyGrib

diff --git a/src/Grib2Reader.h b/src/Grib2Reader.h
@@ -28,7 +28,9 @@ Lecture mise en mémoire d'un fichier GRIB
 #include "GribReader.h"
 #include "Grib2Record.h"
 #include "zuFile.h"
-#include "g2clib/grib2.h"
+extern "C" {
+  #include <grib2.h>
+}
 
 //===============================================================
 class Grib2Reader : public GribReader

diff --git a/src/Grib2Record.h b/src/Grib2Record.h
@@ -19,7 +19,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef GRIB2RECORD_H
 #define GRIB2RECORD_H
 
-#include "g2clib/grib2.h"
+extern "C" {
+  #include <grib2.h>
+}
 #include "GribRecord.h"
 
 //----------------------------------------

diff --git a/src/xyGrib.pro b/src/xyGrib.pro
@@ -36,8 +36,7 @@ else {
 }
 }
 
-LIBS += -lbz2 -lz -lproj -lnova -Lqwt-6.1.3/lib/ -lqwt
-LIBS +=  -Lg2clib -lg2c -lpng -ljasper  # respect order!
+LIBS += -lbz2 -lz -lproj -lnova -lgrib2c -Lqwt-6.1.3/lib/ -lqwt
 
 # ----------------------------------------------------
 CFLAGS += -std=c99