3 files changed, 18 insertions, 37 deletions

diff --git a/libcnary/CMakeLists.txt b/libcnary/CMakeLists.txt
deleted file mode 100644
index bbbe8ce..0000000
--- a/libcnary/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-
-SET(libcnary_SRC
-        iterator.c
-        list.c
-        node.c
-        node_iterator.c
-        node_list.c )
-
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
-
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-ADD_LIBRARY(libcnary STATIC ${libcnary_SRC})
-
-SET_TARGET_PROPERTIES(libcnary PROPERTIES OUTPUT_NAME cnary)
-
diff --git a/libcnary/Makefile b/libcnary/Makefile
deleted file mode 100644
index bdd165d..0000000
--- a/libcnary/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-TARGET = cnary
-LIBRARY = libcnary.a
-OBJECTS = cnary.o libcnary.a
-LIBRARY_OBJECTS = node.o list.o iterator.o node_list.o node_iterator.o
-CFLAGS=-g -I./include -I/opt/local/include -mmacosx-version-min=10.5 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk
-LDFLAGS=-L/opt/local/lib -framework CoreFoundation -mmacosx-version-min=10.5 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk -Wl,-no_compact_linkedit
-
-
-%.o: %.c
-        $(CC) -o $(@) -c $(^) $(CFLAGS)
-
-$(LIBRARY): $(LIBRARY_OBJECTS)
-        $(AR) rs $(@) $(^)
-        
-$(TARGET): $(OBJECTS)
-        $(CC) -o $(@) $(^) $(CFLAGS) $(LDFLAGS)
-
-all: $(TARGET)
-
-clean:
-        rm -rf $(TARGET) $(LIBRARY) $(OBJECTS) $(LIBRARY_OBJECTS)
\ No newline at end of file
diff --git a/libcnary/Makefile.am b/libcnary/Makefile.am
new file mode 100644
index 0000000..ef61c31
--- /dev/null
+++ b/libcnary/Makefile.am
@@ -0,0 +1,18 @@
+AM_CFLAGS = $(GLOBAL_CFLAGS) -Iinclude
+AM_LDFLAGS =
+
+noinst_LTLIBRARIES = libcnary.la
+libcnary_la_LIBADD = 
+libcnary_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined
+libcnary_la_SOURCES = \
+                       node.c \
+                       list.c \
+                       node_list.c \
+                       iterator.c \
+                       node_iterator.c \
+                       include/node.h \
+                       include/list.h \
+                       include/node_list.h \
+                       include/iterator.h \
+                       include/node_iterator.h \
+                       include/object.h