diff --git a/tigge/Makefile.am b/tigge/Makefile.am
index 43d3413ef..5ef416b64 100755
--- a/tigge/Makefile.am
+++ b/tigge/Makefile.am
@@ -1,17 +1,21 @@
 
 AM_CFLAGS =  @WARN_PEDANTIC@ @WERROR@
 
-bin_PROGRAMS        =  tigge_check tigge_name tigge_accumulations tigge_split
+noinst_LTLIBRARIES = libtigge_tools.la
+libtigge_tools_la_SOURCES = tigge_tools.c tigge_tools.h
 
-tigge_check_SOURCES      =  tigge_check.c \
-                            tigge_check.h
 
-tigge_name_SOURCES      =  tigge_name.c
-tigge_split_SOURCES      =  tigge_split.c
+bin_PROGRAMS  =  tigge_check tigge_name tigge_accumulations tigge_split
+
+tigge_check_SOURCES =  tigge_check.c \
+                       tigge_check.h
+
+tigge_name_SOURCES  =  tigge_name.c
+tigge_split_SOURCES =  tigge_split.c
 tigge_accumulations_SOURCES      =  tigge_accumulations.c
 
 INCLUDES =  -I$(top_builddir)/src
 
-LDADD = $(top_builddir)/src/libeccodes.la
+LDADD = libtigge_tools.la $(top_builddir)/src/libeccodes.la
 DEPENDENCIES = $(LDADD)
 EXTRA_DIST = CMakeLists.txt