2 files changed, 26 insertions, 28 deletions
diff --git a/src/objects/Makefile b/src/objects/Makefile
deleted file mode 100644
index 6cc56fb..0000000
--- a/src/objects/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-CC = gcc
-
-PYTHON = /usr/include/python2.4
-IRSSI = /home/chrisd/irssi-0.8.10
-CFLAGS = -fpic -ggdb -Wall -I$(PYTHON) -I$(IRSSI) -I$(IRSSI)/src \
--I$(IRSSI)/src/fe-common/core -I$(IRSSI)/src/core -I$(IRSSI)/src/fe-text \
--I$(IRSSI)/src/irc -I$(IRSSI)/src/irc/core -I$(IRSSI)/src/irc/dcc \
--I$(IRSSI)/src/irc/notifylist -I.. \
-`pkg-config glib-2.0 --cflags`
-
-OBJ = pyscript-object.o base-objects.o window-item-object.o channel-object.o \
-query-object.o server-object.o connect-object.o irc-server-object.o \
-irc-connect-object.o irc-channel-object.o ban-object.o nick-object.o \
-chatnet-object.o reconnect-object.o window-object.o textdest-object.o \
-rawlog-object.o log-object.o logitem-object.o ignore-object.o \
-dcc-object.o dcc-chat-object.o dcc-get-object.o dcc-send-object.o \
-netsplit-object.o netsplit-server-object.o netsplit-channel-object.o \
-notifylist-object.o process-object.o command-object.o theme-object.o \
-statusbar-item-object.o main-window-object.o factory.o
-
-pyobjects.a: $(OBJ)
-	ar r pyobjects.a $(OBJ)
-
-%.o: %.c
-	$(CC) -c $< $(CFLAGS)
-
-clean:
-	rm -f *.o *.so *.a
diff --git a/src/objects/Makefile.am b/src/objects/Makefile.am
new file mode 100644
index 0000000..4164e8f
--- /dev/null
+++ b/src/objects/Makefile.am
@@ -0,0 +1,26 @@
+noinst_LTLIBRARIES = libobjects.la
+
+INCLUDES = $(IRSSI_PYTHON_INCLUDES) \
+		   -I$(top_srcdir)/src 
+
+libobjects_la_SOURCES = \
+	pyscript-object.c base-objects.c window-item-object.c channel-object.c \
+	query-object.c server-object.c connect-object.c irc-server-object.c \
+	irc-connect-object.c irc-channel-object.c ban-object.c nick-object.c \
+	chatnet-object.c reconnect-object.c window-object.c textdest-object.c \
+	rawlog-object.c log-object.c logitem-object.c ignore-object.c \
+	dcc-object.c dcc-chat-object.c dcc-get-object.c dcc-send-object.c \
+	netsplit-object.c netsplit-server-object.c netsplit-channel-object.c \
+	notifylist-object.c process-object.c command-object.c theme-object.c \
+	statusbar-item-object.c main-window-object.c factory.c
+
+noinst_HEADERS = \
+	ban-object.h base-objects.h channel-object.h chatnet-object.h \
+	command-object.h connect-object.h dcc-chat-object.h dcc-get-object.h \
+	dcc-object.h dcc-send-object.h factory.h ignore-object.h \
+	irc-channel-object.h irc-connect-object.h irc-server-object.h logitem-object.h \
+	log-object.h main-window-object.h netsplit-channel-object.h netsplit-object.h \
+	netsplit-server-object.h nick-object.h notifylist-object.h process-object.h \
+	pyscript-object.h query-object.h rawlog-object.h reconnect-object.h \
+	server-object.h statusbar-item-object.h textdest-object.h theme-object.h \
+	window-item-object.h window-object.h