at work

Makefile.am

@@ -1,43 +1,21 @@
 
 AUTOMAKE_OPTIONS = foreign no-dependencies no-installinfo subdir-objects
 
-SUBDIRS = tests
+SUBDIRS = clib
 
 SUFFIXES = .c .o
-AM_CFLAGS = -Wall
+AM_CFLAGS = -Wall -I./clib
 AM_LDFLAGS = -pthread
 
 .c.o:
-	$(CC) -I. -pthread $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+	$(CC) -I. -pthread $(CPPFLAGS) $(CFLAGS) $(AM_CFLAGS) -c -o $@ $<
 
 #config.h: config.h.in
 #	./config.status $@
 
 sbin_PROGRAMS = cworker
-cworker_SOURCES = main.c cworker.c $(common_SOURCES)
-
-common_SOURCES = \
-	cflexer.c \
-	cflexer.h \
-	cfparser.c \
-	cfparser.h \
-	cllexer.c \
-	cllexer.h \
-	clparser.c \
-	clparser.h \
-	jlexer.c \
-	jlexer.h \
-	jparser.c \
-	jparser.h \
-	logger.c \
-	logger.h \
-	massert.c \
-	massert.h \
-	rcache.c \
-	rcache.h \
-	jblock.c \
-	jblock.h
-
+cworker_SOURCES = main.c cworker.c cworker.h
+cworker_LDADD = clib/libcworker.la
 
 run: $(sbin_PROGRAMS)
 	./cworker --port=9002 --nofork=true