diff --git a/src/Makefile.am.alt b/src/Makefile.am.alt
index 9514181..c5dd5d0 100644
--- a/src/Makefile.am.alt
+++ b/src/Makefile.am.alt
@@ -1,5 +1,4 @@
-#SUBDIRS = dependencies zimlib ctpp2 pugixml components
-SUBDIRS = zimlib ctpp2 pugixml
+SUBDIRS = dependencies zimlib ctpp2 pugixml
 
 if WITH_MANAGER
     SUBDIRS += manager 
diff --git a/src/reader/Makefile.am.alt b/src/reader/Makefile.am.alt
index e69de29..049d1ba 100644
--- a/src/reader/Makefile.am.alt
+++ b/src/reader/Makefile.am.alt
@@ -0,0 +1,10 @@
+bin_PROGRAMS=kiwix-read
+AM_CPPFLAGS=-I$(top_srcdir)/src/common -I$(top_srcdir)/src/zimlib/include
+kiwix_read_SOURCES= \
+	kiwix-read.cpp \
+	../common/kiwix/reader.cpp
+include_HEADERS= \
+	../common/kiwix/reader.h
+kiwix_read_CXXFLAGS=$(ZIMLIB_CFLAGS) $(LZMA_CFLAGS) -I../common/
+kiwix_read_LDFLAGS=$(ZIMLIB_LDFLAGS) $(LZMA_LDFLAGS)
+kiwix_read_LDADD=$(top_builddir)/src/zimlib/src/libzim.la
\ No newline at end of file
diff --git a/src/searcher/Makefile.am.alt b/src/searcher/Makefile.am.alt
index e69de29..0f309b1 100644
--- a/src/searcher/Makefile.am.alt
+++ b/src/searcher/Makefile.am.alt
@@ -0,0 +1,16 @@
+bin_PROGRAMS=kiwix-search
+AM_CPPFLAGS=-I$(top_srcdir)/src/common
+kiwix_search_SOURCES= \
+	kiwix-search.cpp \
+	../common/unaccent.cpp \
+	../common/kiwix/searcher.cpp \
+	../common/kiwix/xapianSearcher.cpp \
+	../common/kiwix/cluceneSearcher.cpp 
+include_HEADERS= \
+	../common/unaccent.h \
+	../common/kiwix/searcher.h \
+	../common/kiwix/xapianSearcher.h \
+	../common/kiwix/cluceneSearcher.h 
+kiwix_search_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(CTPP2_CFLAGS) -I../common/
+kiwix_search_LDFLAGS=$(XAPIAN_LDFLAGS) $(CLUCENE_LDFLAGS) $(ICU_LDFLAGS) $(CTPP2_LDFLAGS)
+kiwix_search_LDADD=../ctpp2/src/.libs/libctpp2.a
diff --git a/src/server/Makefile.am.alt b/src/server/Makefile.am.alt
index 4dac6d8..ffd5d49 100644
--- a/src/server/Makefile.am.alt
+++ b/src/server/Makefile.am.alt
@@ -28,10 +28,4 @@ include_HEADERS= \
 kiwix_serve_CXXFLAGS=${MICROHTTPD_CFLAGS} -I${CURRENT_PATH}/src/ctpp2/include $(CLUCENE_CFLAGS) $(XAPIAN_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) -I../common/
 
 kiwix_serve_LDFLAGS=${MICROHTTPD_LDFLAGS} $(CLUCENE_LDFLAGS) $(XAPIAN_LDFLAGS) $(ICU_LDFLAGS) $(LZMA_LDFLAGS)
-kiwix_serve_LDADD=../zimlib/src/.libs/libzim.a ../ctpp2/src/.libs/libctpp2.a ../pugixml/.libs/libpugixml.a
-
-
-#if IS_STATIC
-#kiwix_serve_LDFLAGS= -ldl -lm -lpthread -luuid ${LIBMICROHTTPD_STATIC_LDFLAGS} #${LIBPUGIXML_STATIC_LDFLAGS} $(LIBCTPP2_STATIC_LDFLAGS) $(LIBCLUCENE_STATIC_LDFLAGS) $(LIBXAPIAN_STATIC_LDFLAGS) $(LIBICU_STATIC_LDFLAGS) $(LIBZIMSELF_STATIC_LDFLAGS) $(LIBLZMA_STATIC_LDFLAGS) $(LIBZ_STATIC_LDFLAGS)
-#else
-#endif
\ No newline at end of file
+kiwix_serve_LDADD=../zimlib/src/.libs/libzim.a ../ctpp2/src/.libs/libctpp2.a ../pugixml/.libs/libpugixml.a
\ No newline at end of file