diff --git a/src/Makefile.am.alt b/src/Makefile.am.alt
index 0e10925..9514181 100644
--- a/src/Makefile.am.alt
+++ b/src/Makefile.am.alt
@@ -1,12 +1,12 @@
 #SUBDIRS = dependencies zimlib ctpp2 pugixml components
-SUBDIRS = zimlib
+SUBDIRS = zimlib ctpp2 pugixml
 
 if WITH_MANAGER
     SUBDIRS += manager 
 endif
 
 if WITH_SERVER
-	SUBDIRS += server 
+    SUBDIRS += server 
 endif
 
 if WITH_INDEXER
diff --git a/src/ctpp2/Makefile.am.alt b/src/ctpp2/Makefile.am.alt
index e69de29..6770d02 100644
--- a/src/ctpp2/Makefile.am.alt
+++ b/src/ctpp2/Makefile.am.alt
@@ -0,0 +1,2 @@
+SUBDIRS=src
+EXTRA_DIST=include
\ No newline at end of file
diff --git a/src/ctpp2/src/Makefile.am.alt b/src/ctpp2/src/Makefile.am.alt
index e69de29..82ff0d2 100644
--- a/src/ctpp2/src/Makefile.am.alt
+++ b/src/ctpp2/src/Makefile.am.alt
@@ -0,0 +1,93 @@
+AM_CPPFLAGS=-I$(top_srcdir)/src/ctpp2/include -I$(top_srcdir)/src/ctpp2/include/functions
+
+noinst_LTLIBRARIES = libctpp2.la
+
+libctpp2_la_SOURCES = \
+	CTPP2Logger.cpp \
+	CTPP2VMExecutable.cpp \
+	CTPP2JSONFileParser.cpp \
+	CTPP2FileSourceLoader.cpp \
+	CTPP2VMMemoryCore.cpp \
+	CTPP2VMOpcodeCollector.cpp \
+	CTPP2VMArgStack.cpp \
+	CTPP2FileOutputCollector.cpp \
+	CTPP2Compiler.cpp \
+	CTPP2VMFileLoader.cpp \
+	CTPP2BitIndex.cpp \
+	CTPP2VMException.cpp \
+	CTPP2StreamOutputCollector.cpp \
+	CTPP2StringBuffer.cpp \
+	CDTSortRoutines.cpp \
+	CTPP2VMDebugInfo.cpp \
+	CTPP2SyscallFactory.cpp \
+	CTPP2HashTable.cpp \
+	CTPP2Exception.cpp \
+	CTPP2Sprintf.cpp \
+	CTPP2StaticData.cpp \
+	CDT.cpp \
+	CTPP2VMSTDLib.cpp \
+	CTPP2VMSyscall.cpp \
+	CTPP2ParserException.cpp \
+	CTPP2VM.cpp \
+	CTPP2FileLogger.cpp \
+	CTPP2Parser.cpp \
+	CTPP2Error.cpp \
+	CTPP2StaticText.cpp \
+	CTPP2StringOutputCollector.cpp \
+	CTPP2VMCodeStack.cpp \
+	functions/FnBase64Encode.cpp \
+	functions/FnInSet.cpp \
+	functions/FnSubstring.cpp \
+	functions/FnGetText.cpp \
+	functions/FnMin.cpp \
+	functions/FnMBSubstring.cpp \
+	functions/FnVersion.cpp \
+	functions/FnListElement.cpp \
+	functions/FnMax.cpp \
+	functions/FnConcat.cpp \
+	functions/FnSize.cpp \
+	functions/FnMBSize.cpp \
+	functions/FnBase64Decode.cpp \
+	functions/FnFormParam.cpp \
+	functions/FnXMLEscape.cpp \
+	functions/FnWMLEscape.cpp \
+	functions/FnHMACMD5.cpp \
+	functions/FnDateFormat.cpp \
+	functions/FnHTMLEscape.cpp \
+	functions/FnTruncate.cpp \
+	functions/FnURLEscape.cpp \
+	functions/FnIconv.cpp \
+	functions/FnURIEscape.cpp \
+	functions/FnNumFormat.cpp \
+	functions/FnMD5.cpp \
+	functions/FnGetText_.cpp \
+	functions/FnJSEscape.cpp \
+	functions/FnDefined.cpp \
+	functions/FnSprintf.cpp \
+	functions/FnHrefParam.cpp \
+	functions/FnCast.cpp \
+	functions/FnJSON.cpp \
+	functions/FnRandom.cpp \
+	functions/FnLog.cpp \
+	functions/FnObjDump.cpp \
+	functions/FnMBTruncate.cpp \
+	functions/FnDefault.cpp \
+	functions/FnNumeral.cpp \
+	functions/FnAvg.cpp \
+	functions/FnEmitter.cpp \
+	functions/FnError.cpp \
+	functions/FnHashElement.cpp \
+	functions/FnArrayElement.cpp \
+	CTPP2VMDumper.cpp \
+	CTPP2JSONParser.cpp \
+	CTPP2DTOA.cpp \
+	CTPP2Util.cpp
+
+libctpp2_la_CXXFLAGS=-fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+#if IS_OSX
+#libctpp2_la_CXXFLAGS+= -I/opt/local/include
+#endif
+
+libctpp2_la_LDFLAGS=
+
+CLEANFILES=*.obj *.lib *.dll
\ No newline at end of file
diff --git a/src/indexer/Makefile.am.alt b/src/indexer/Makefile.am.alt
index e69de29..836bb66 100644
--- a/src/indexer/Makefile.am.alt
+++ b/src/indexer/Makefile.am.alt
@@ -0,0 +1,21 @@
+bin_PROGRAMS=kiwix-index
+AM_CPPFLAGS=-I$(top_srcdir)/src/common -I$(top_srcdir)/src/zimlib/include -I$(top_srcdir)/src/ctpp2/include
+kiwix_index_SOURCES= \
+	kiwix-index.cpp \
+	../common/kiwix/xapian/myhtmlparse.cc \
+	../common/kiwix/xapian/htmlparse.cc \
+	../common/unaccent.cpp \
+	../common/kiwix/indexer.cpp \
+	../common/kiwix/xapianIndexer.cpp \
+	../common/kiwix/cluceneIndexer.cpp 
+include_HEADERS= \
+	../common/kiwix/xapian/myhtmlparse.h \
+	../common/kiwix/xapian/namedentities.h \
+	../common/kiwix/xapian/htmlparse.h \
+	../common/unaccent.h \
+	../common/kiwix/indexer.h \
+	../common/kiwix/xapianIndexer.h \
+	../common/kiwix/cluceneIndexer.h 
+kiwix_index_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) -I../common/
+kiwix_index_LDFLAGS=$(XAPIAN_LDFLAGS) $(CLUCENE_LDFLAGS) $(ICU_LDFLAGS) $(LZMA_LDFLAGS)
+kiwix_index_LDADD=../zimlib/src/.libs/libzim.a
diff --git a/src/pugixml/Makefile.am.alt b/src/pugixml/Makefile.am.alt
index e69de29..5c749e7 100644
--- a/src/pugixml/Makefile.am.alt
+++ b/src/pugixml/Makefile.am.alt
@@ -0,0 +1,13 @@
+AM_CPPFLAGS=
+
+noinst_LTLIBRARIES = libpugixml.la
+
+libpugixml_la_SOURCES = \
+	pugixml.cpp \
+	pugixml.hpp \
+	pugiconfig.hpp
+
+libpugixml_la_CXXFLAGS=-fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+libpugixml_la_LDFLAGS=
+
+CLEANFILES=*.obj *.lib *.dll
\ No newline at end of file
diff --git a/src/server/Makefile.am.alt b/src/server/Makefile.am.alt
index e69de29..4dac6d8 100644
--- a/src/server/Makefile.am.alt
+++ b/src/server/Makefile.am.alt
@@ -0,0 +1,37 @@
+bin_PROGRAMS=kiwix-serve
+AM_CPPFLAGS=-I$(top_srcdir)/src/common -I$(top_srcdir)/src/zimlib/include -I$(top_srcdir)/src/ctpp2/include -I$(top_srcdir)/src/pugixml
+kiwix_serve_SOURCES= \
+	kiwix-serve.cpp \
+	../common/kiwix/reader.cpp \
+	../common/kiwix/searcher.cpp \
+	../common/kiwix/manager.cpp \
+	../common/kiwix/library.cpp \
+	../common/kiwix/xapianSearcher.cpp \
+	../common/kiwix/cluceneSearcher.cpp \
+	../common/unaccent.cpp \
+	../common/base64.cpp \
+	../common/pathTools.cpp \
+	../common/regexTools.cpp \
+	../common/splitString.cpp 
+include_HEADERS= \
+	../common/kiwix/reader.h \
+	../common/kiwix/searcher.h \
+	../common/kiwix/manager.h \
+	../common/kiwix/library.h \
+	../common/kiwix/xapianSearcher.h \
+	../common/kiwix/cluceneSearcher.h \
+	../common/unaccent.h \
+	../common/base64.h \
+	../common/pathTools.h \
+	../common/regexTools.h \
+	../common/splitString.cpp 
+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