From: Ole Streicher <olebole@debian.org>
Date: Fri, 22 Jul 2016 14:45:12 +0200
Subject: Dynamically link libraries

---
 QFitsView/QFitsView.pro        |  6 +++---
 QFitsView/QFitsView_common.pro | 28 ++++++++++------------------
 dpuser/Makefile                | 29 +++++++++--------------------
 3 files changed, 22 insertions(+), 41 deletions(-)

diff --git a/QFitsView/QFitsView.pro b/QFitsView/QFitsView.pro
index 1ed4cca..d961e50 100644
--- a/QFitsView/QFitsView.pro
+++ b/QFitsView/QFitsView.pro
@@ -151,7 +151,7 @@ win32 {
 
 ##### ZLIB stuff
 win32:CONFIG(debug, debug|release): LIBS += ../lib/$$ARCH$$ARCHBIT/libpng.a ../lib/$$ARCH$$ARCHBIT/libz.a
-linux: LIBS += ../lib/$$ARCH$$ARCHBIT/libz.a
+linux: LIBS += -lz
 mac: LIBS += ../lib/$$ARCH$$ARCHBIT/libpng.a ../lib/$$ARCH$$ARCHBIT/libz.a
 
 #exists( $(QTDIR)/include/QtZlib/zlib.h) {
@@ -170,7 +170,7 @@ mac {
 #### settings specific to LINUX #####
 unix:!mac { 
     LIBS += -rdynamic \
-            -lXt
+            -ldl -lgsl -lgslcblas -lfftw3 -lxpa
 }
 
 # ### add sources and headers ################
@@ -196,5 +196,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 a63a997..0e5f954 100644
--- a/QFitsView/QFitsView_common.pro
+++ b/QFitsView/QFitsView_common.pro
@@ -20,12 +20,12 @@ win32_setup {
 # ### Common Libraries ################
 qf_libs_common{
     contains(DEFINES, HAS_GDL) {
-        LIBS += ../lib/$$ARCH$$ARCHBIT/libgdl.a \
-                ../lib/$$ARCH$$ARCHBIT/libplplotcxx.a \
-                   ../lib/$$ARCH$$ARCHBIT/libplplot.a \
+        LIBS += -lgdl \
+                -lplplotcxx \
+                -lplplot \
 									 ../lib/$$ARCH$$ARCHBIT/libfftw3f.a \
 #		   ../lib/$$ARCH$$ARCHBIT/libplplotqt.a \
-                   ../lib/$$ARCH$$ARCHBIT/libqsastime.a \
+                   -lqsastime \
 #                   ../lib/$$ARCH$$ARCHBIT/libcsironn.a \
 									 ../lib/$$ARCH$$ARCHBIT/libcsirocsa.a
         win32 {
@@ -51,25 +51,17 @@ qf_libs_common{
 #						LIBS += -lpython3.5m
         }
 		}
-    LIBS += ../lib/$$ARCH$$ARCHBIT/libfftw3.a \
-#            ../lib/$$ARCH$$ARCHBIT/librfftw.a \
-#            ../lib/$$ARCH$$ARCHBIT/libfftw.a \
-            ../lib/$$ARCH$$ARCHBIT/libgsl.a \
-            ../lib/$$ARCH$$ARCHBIT/libgslcblas.a \
-            ../lib/$$ARCH$$ARCHBIT/libxpa.a
+    LIBS += -lfftw3 \
+            -lgsl \
+            -lgslcblas \
+            -lxpa
     unix:!mac {
         contains(QMAKE_HOST.arch, x86_64):{
-            LIBS += ../lib/$$ARCH$$ARCHBIT/libmng.a
+            LIBS +=
         }
     }
     contains(DEFINES, HAS_PGPLOT) {
-        LIBS += ../lib/$$ARCH$$ARCHBIT/libcpgplot.a
-        mac {
-            LIBS += ../lib/$$ARCH$$ARCHBIT/libpgplot_qf.a
-        } else {
-            LIBS += ../lib/$$ARCH$$ARCHBIT/libpgplot.a
-        }
-        LIBS += ../lib/$$ARCH$$ARCHBIT/libf2c.a
+        LIBS += -lcpgplot
     }
 }
 
diff --git a/dpuser/Makefile b/dpuser/Makefile
index 7d46cdc..fa30170 100644
--- a/dpuser/Makefile
+++ b/dpuser/Makefile
@@ -209,26 +209,15 @@ else
       LDFLAG      = -static-libstdc++ -static-libgcc
       SED_INPLACE = sed -i''
       LIBS        = -rdynamic \
-                    ../lib/$(OS)$(ARCH)/libxpa.a \
-                    ../lib/$(OS)$(ARCH)/libfftw3.a \
-                    ../lib/$(OS)$(ARCH)/libcpgplot.a \
-                    ../lib/$(OS)$(ARCH)/libpgplot.a \
-                    ../lib/$(OS)$(ARCH)/libf2c.a \
-                    ../lib/$(OS)$(ARCH)/libz.a \
-                    ../lib/$(OS)$(ARCH)/libpng.a \
-                    ../lib/$(OS)$(ARCH)/libreadline.a \
-                    ../lib/$(OS)$(ARCH)/libncurses.a
-   ifeq ($(GDL), -DHAS_GDL)
-	LIBS +=	          ../lib/$(OS)$(ARCH)/libgdl.a \
-                    ../lib/$(OS)$(ARCH)/libplplotcxx.a \
-                    ../lib/$(OS)$(ARCH)/libfftw3f.a \
-                    ../lib/$(OS)$(ARCH)/libplplot.a \
-                    ../lib/$(OS)$(ARCH)/libqsastime.a
-   endif
-          LIBS +=          ../lib/$(OS)$(ARCH)/libgsl.a \
-                    ../lib/$(OS)$(ARCH)/libgslcblas.a \
-                    ../lib/$(OS)$(ARCH)/libz.a
-
+		     -lcpgplot \
+		     -lxpa \
+		     -lfftw3 \
+		     -ldl \
+		     -lreadline \
+                     -ldl -lpthread
+          LIBS +=   -lgsl \
+		     -lgslcblas \
+		     -lz
    ifeq ($(PY), -DHAS_PYTHON)
 #      LIBS += /usr/lib/x86_64-linux-gnu/libpython3.5m.a -lexpat -lutil
       INCPATH  += -I/usr/include/python3.5m