From: Ole Streicher <olebole@debian.org>
Date: Fri, 8 Oct 2021 17:42:02 +0200
Subject: Dynamically link libraries

---
 QFitsView/QFitsView.pro        |  7 +++----
 QFitsView/QFitsView_common.pro | 21 ++++++++++-----------
 QFitsView/QFitsView_dll.pro    |  1 -
 dpuser/Makefile                | 38 +++++++++++++++++---------------------
 4 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/QFitsView/QFitsView.pro b/QFitsView/QFitsView.pro
index d55c4b8..bc2f657 100644
--- a/QFitsView/QFitsView.pro
+++ b/QFitsView/QFitsView.pro
@@ -29,7 +29,7 @@ QT += network \
 
 #DEFINES += HAS_PYTHON
 
-DEFINES += HAS_PG2PLPLOT
+DEFINES +=
 
 # This is necessare so python_dpuser.cpp can compile in debug mode
 #CONFIG(debug):QMAKE_CXXFLAGS +=" -O2 "
@@ -85,9 +85,7 @@ win32:!vs_proj:DEFINES += HAVE_MINGW32  # needed for xpa
 
 # ### set DEFINES ################
 DEFINES += DPQT \
-           HAS_PLPLOT \
            HAS_PGPLOT \
-           HAS_DPPGPLOT \
            NO_READLINE \
            $$ARCH
 #contains(QT, opengl):DEFINES += HAS_VTK
@@ -176,6 +174,7 @@ mac {
 unix:!mac { 
     LIBS += -rdynamic \
 #            -lXt
+            -ldl -lgsl -lgslcblas -lfftw3 -lxpa
 }
 
 # ### add sources and headers ################
@@ -201,5 +200,5 @@ win32:!qf_shared {
 win32:qf_shared:SOURCES = launcher.cpp
 
 !win32:qf_shared {
-    LIBS += ../lib/$$ARCH$$ARCHBIT/libpng.a ../lib/$$ARCH$$ARCHBIT/libz.a
+    LIBS += -lz
 }
diff --git a/QFitsView/QFitsView_common.pro b/QFitsView/QFitsView_common.pro
index 9eeddd4..b68b538 100644
--- a/QFitsView/QFitsView_common.pro
+++ b/QFitsView/QFitsView_common.pro
@@ -41,12 +41,12 @@ qf_libs_common{
 		}
 
 		equals(PLPLOTLIB, 1) {
-						LIBS += ../lib/$$ARCH$$ARCHBIT/libplplotcxx.a \
-                   ../lib/$$ARCH$$ARCHBIT/libplplot.a \
-#		   ../lib/$$ARCH$$ARCHBIT/libplplotqt.a \
-                   ../lib/$$ARCH$$ARCHBIT/libqsastime.a \
-                   ../lib/$$ARCH$$ARCHBIT/libcsironn.a \
-									 ../lib/$$ARCH$$ARCHBIT/libcsirocsa.a
+						LIBS += -lplplotcxx \
+                   -lplplot \
+#		   -lplplotqt \
+                   -lqsastime \
+                   -lcsironn \
+									 -lcsirocsa
         win32 {
            LIBS += ../lib/$$ARCH$$ARCHBIT/libgnurx.a \
                ../lib/$$ARCH$$ARCHBIT/libxdr.a -lshlwapi -lcomdlg32 -lcomctl32
@@ -56,13 +56,13 @@ qf_libs_common{
 #        }
     }
 		equals(PGPLOTLIB, 1) {
-        LIBS += ../lib/$$ARCH$$ARCHBIT/libcpgplot.a
+        LIBS += -lcpgplot
         mac {
             LIBS += ../lib/$$ARCH$$ARCHBIT/libpgplot_qf.a
         } else {
-            LIBS += ../lib/$$ARCH$$ARCHBIT/libpgplot.a
+            LIBS +=
         }
-        LIBS += ../lib/$$ARCH$$ARCHBIT/libf2c.a
+        LIBS +=
 		}
     contains(DEFINES, HAS_PYTHON) {
         INCLUDEPATH += ../include/$$ARCH/python
@@ -74,7 +74,7 @@ qf_libs_common{
 #            ../lib/$$ARCH$$ARCHBIT/libxpa.a
     unix:!mac {
         contains(QMAKE_HOST.arch, x86_64):{
-            LIBS += ../lib/$$ARCH$$ARCHBIT/libmng.a
+            LIBS +=
         }
     }
 }
@@ -209,7 +209,6 @@ dp_sources {
 
     SOURCES +=      ../utils/dpstring.cpp \
                     ../utils/dpstringlist.cpp \
-                    ../utils/cpgplot.cpp \
                     ../utils/regex/regex_sr.cpp \
                     ../utils/cmpfit/mpfit.cpp \
 		    ../utils/kabsch/kabsch2d.cpp \
diff --git a/QFitsView/QFitsView_dll.pro b/QFitsView/QFitsView_dll.pro
index fb0bc5d..baa73d4 100644
--- a/QFitsView/QFitsView_dll.pro
+++ b/QFitsView/QFitsView_dll.pro
@@ -64,7 +64,6 @@ win32:!vs_proj:DEFINES += HAVE_MINGW32  # needed for xpa
 DEFINES -= UNICODE
 DEFINES += DPQT \
            HAS_PGPLOT \
-		   HAS_DPPGPLOT \
            NO_READLINE \
            $$ARCH
 
diff --git a/dpuser/Makefile b/dpuser/Makefile
index 10f35d7..48c8e4d 100644
--- a/dpuser/Makefile
+++ b/dpuser/Makefile
@@ -36,10 +36,10 @@ QF          =
 GDL         = -DHAS_GDL
 PY          = -DHAS_PYTHON
 
-PLPLOT      = -DHAS_PLPLOT
+PLPLOT      =
 PGPLOT      = -DHAS_PGPLOT
-DPPGPLOT    = -DHAS_DPPGPLOT
-PG2PLPLOT   = -DHAS_PG2PLPLOT
+DPPGPLOT    =
+PG2PLPLOT   =
 
 PLPLOTLIB   =
 PGPLOTLIB   =
@@ -117,8 +117,7 @@ OBJECTS =     dpuser_utils.o \
               lex.yy.o \
               svn_revision.o \
 							gdl_dpuser.o \
-							python_dpuser.o \
-							cpgplot.o
+							python_dpuser.o
 
 ifeq ($(PGPLOT), -DHAS_PGPLOT)
    ifeq ($(DPPGPLOT), -DHAS_DPPGPLOT)
@@ -227,31 +226,28 @@ else
 
    else
       OS          = LINUX
-      LDFLAG      = -static-libstdc++ -static-libgcc
+      LDFLAG      = 
       SED_INPLACE = sed -i''
       LIBS        = -rdynamic \
-                    ../lib/$(OS)$(ARCH)/libxpa.a \
-                    ../lib/$(OS)$(ARCH)/libfftw3.a \
-                    ../lib/$(OS)$(ARCH)/libreadline.a \
-                    ../lib/$(OS)$(ARCH)/libncurses.a
+                    -lxpa \
+                    -lfftw3 \
+                    -lreadline
    ifeq ($(GDL), -DHAS_GDL)
           LIBS +=   ../lib/$(OS)$(ARCH)/libgdl.a
    endif
 	 ifeq ($(PLPLOTLIB), -y)
-          LIBS +=   ../lib/$(OS)$(ARCH)/libplplotcxx.a \
-                    ../lib/$(OS)$(ARCH)/libfftw3f.a \
-                    ../lib/$(OS)$(ARCH)/libplplot.a \
-                    ../lib/$(OS)$(ARCH)/libqsastime.a
+          LIBS +=   -lplplotcxx \
+                    -lfftw3f \
+                    -lplplot \
+                    -lqsastime
    endif
    ifeq ($(PGPLOTLIB), -y)
-          LIBS +=   ../lib/$(OS)$(ARCH)/libcpgplot.a \
-                    ../lib/$(OS)$(ARCH)/libpgplot.a \
-                    ../lib/$(OS)$(ARCH)/libf2c.a
+          LIBS +=   -lcpgplot
    endif
-      LIBS +=   ../lib/$(OS)$(ARCH)/libgsl.a \
-                ../lib/$(OS)$(ARCH)/libgslcblas.a \
-                ../lib/$(OS)$(ARCH)/libz.a \
-                ../lib/$(OS)$(ARCH)/libpng.a
+      LIBS +=   -lgsl \
+                -lgslcblas \
+                -lz \
+                -lpng
    ifeq ($(PY), -DHAS_PYTHON)
 #      LIBS += /usr/lib/x86_64-linux-gnu/libpython3.5m.a -lexpat -lutil
       INCPATH  += -I/usr/include/python3.5m