1 files changed, 11 insertions, 69 deletions
diff --git a/src/libmowgli/Makefile b/src/libmowgli/Makefile
index d25902e..4cf3942 100644
--- a/src/libmowgli/Makefile
+++ b/src/libmowgli/Makefile
@@ -1,77 +1,19 @@
 include ../../extra.mk
 
-LIB = ${LIB_PREFIX}mowgli${LIB_SUFFIX}
-LIB_MAJOR = 2
+LIB_MAJOR = 0
 LIB_MINOR = 0
-DISTCLEAN = mowgli_config.h
 
-SRCS = mowgli_alloc.c			\
-       mowgli_allocation_policy.c	\
-       mowgli_allocator.c		\
-       mowgli_argstack.c		\
-       mowgli_bitvector.c		\
-       mowgli_dictionary.c		\
-       mowgli_error_backtrace.c		\
-       mowgli_formatter.c		\
-       mowgli_global_storage.c		\
-       mowgli_hash.c			\
-       mowgli_heap.c			\
-       mowgli_hook.c			\
-       mowgli_index.c			\
-       mowgli_init.c			\
-       mowgli_ioevent.c			\
-       mowgli_list.c			\
-       mowgli_logger.c			\
-       mowgli_mempool.c			\
-       $(MOWGLI_MODULE)			\
-       mowgli_object.c			\
-       mowgli_object_class.c		\
-       mowgli_object_messaging.c	\
-       mowgli_object_metadata.c		\
-       mowgli_patricia.c		\
-       mowgli_queue.c			\
-       mowgli_random.c			\
-       mowgli_signal.c			\
-       mowgli_spinlock.c		\
-       mowgli_string.c			\
+SHARED_LIB = ${LIBMOWGLI_SHARED_LIB}
+STATIC_LIB = ${LIBMOWGLI_STATIC_LIB}
 
-INCLUDES = mowgli.h			\
-	   mowgli_alloc.h		\
-	   mowgli_allocation_policy.h	\
-	   mowgli_allocator.h		\
-	   mowgli_argstack.h		\
-	   mowgli_assert.h		\
-	   mowgli_bitvector.h		\
-	   mowgli_config.h		\
-	   mowgli_dictionary.h		\
-	   mowgli_error_backtrace.h	\
-	   mowgli_exception.h		\
-	   mowgli_formatter.h		\
-	   mowgli_global_storage.h	\
-	   mowgli_hash.h		\
-	   mowgli_heap.h		\
-	   mowgli_hook.h		\
-	   mowgli_index.h		\
-	   mowgli_init.h		\
-	   mowgli_ioevent.h		\
-	   mowgli_iterator.h		\
-	   mowgli_list.h		\
-	   mowgli_logger.h		\
-	   mowgli_mempool.h		\
-	   mowgli_module.h		\
-	   mowgli_object.h		\
-	   mowgli_object_class.h	\
-	   mowgli_object_messaging.h	\
-	   mowgli_object_metadata.h	\
-	   mowgli_patricia.h		\
-	   mowgli_queue.h		\
-	   mowgli_random.h		\
-	   mowgli_signal.h		\
-	   mowgli_spinlock.h		\
-	   mowgli_stdinc.h		\
-	   mowgli_string.h
+SUBDIRS = ${LIBMOWGLI_MODULES} platform
+
+INCLUDES = mowgli.h
+
+LIB_OBJS_EXTRA = ${LIB_OBJS} ${LIBMOWGLI_SHARED_MODULES}
+OBJS_EXTRA = ${LIBMOWGLI_STATIC_MODULES}
 
 include ../../buildsys.mk
 
-CPPFLAGS += ${LIB_CPPFLAGS} -I. -I.. -DMOWGLI_CORE
-CFLAGS += ${LIB_CFLAGS}
+LIBS += ${PTHREAD_LIBS}
+CPPFLAGS += -I. -I../.. -DMOWGLI_CORE