Blob Blame History Raw
--- a/Makefile	2017-07-19 21:52:46.203376052 +0200
+++ b/Makefile.edit	2017-07-20 06:55:49.265234728 +0200
@@ -8,7 +8,7 @@
 ifeq (${BUILDS_SHARED},yes)
 # Additional targets. Builds relocatble first so that the tools are
 # preferably linked statically.
-all: relocatable static tools
+all: relocatable tools
 install:  install-clean install_static \
 		install_library_type/relocatable    \
 		install_tools \
--- a/Makefile	2017-07-20 08:23:50.070546782 +0200
+++ b/Makefile.edit	2017-07-20 08:24:20.103396871 +0200
@@ -27,8 +27,8 @@
 
 static-pic: build_library_type/static-pic
 
-tools: build_tools/static
-install_tools: install_tools/static
+tools: build_tools/relocatable
+install_tools: install_tools/relocatable
 
 ifeq (${BUILDS_STATIC_PIC},yes)
 static: build_library_type/static build_library_type/static-pic
--- a/Makefile	2017-07-20 08:29:15.091954506 +0200
+++ b/Makefile.edit	2017-07-20 08:30:13.335723884 +0200
@@ -9,7 +9,7 @@
 # Additional targets. Builds relocatble first so that the tools are
 # preferably linked statically.
 all: relocatable tools
-install:  install-clean install_static \
+install:  install-clean \
 		install_library_type/relocatable    \
 		install_tools \
                 install_gps_plugin
@@ -23,22 +23,10 @@
 #######################################################################
 #  build
 
-## Builds explicitly the shared or the static libraries
-
-static-pic: build_library_type/static-pic
 
 tools: build_tools/relocatable
 install_tools: install_tools/relocatable
 
-ifeq (${BUILDS_STATIC_PIC},yes)
-static: build_library_type/static build_library_type/static-pic
-install_static: install_library_type/static \
-                install_library_type/static-pic
-else
-static: build_library_type/static
-install_static: install_library_type/static
-endif
-
 shared relocatable: build_library_type/relocatable
 
 # Build either type of library. The argument (%) is the type of library to build