# HG changeset patch # User Tero Marttila # Date 1237154819 -7200 # Node ID 3c440bebcea7154de207c3b82144045bb2b91931 # Parent 375a3b5c3a4699f23e5a108aa4a9da10e6cfc258 remove old Makefile and fix doxygen.conf.in diff -r 375a3b5c3a46 -r 3c440bebcea7 Makefile --- a/Makefile Mon Mar 16 00:03:31 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,110 +0,0 @@ -# default is test -ifndef MODE -MODE = test -endif - -ifeq ($(MODE), debug) -MODE_CFLAGS = -g -DDEBUG_ENABLED -else ifeq ($(MODE), dev) -MODE_CFLAGS = -g -else ifeq ($(MODE), test) -MODE_CFLAGS = -g -DINFO_DISABLED -else ifeq ($(MODE), release) -MODE_CFLAGS = -DINFO_DISABLED -O2 -endif - -FIXED_CFLAGS = -Wall -Wextra -std=gnu99 - -# libevent -LIBEVENT_CFLAGS = -I/home/terom/opt/include -LIBEVENT_LDFLAGS = -L/home/terom/opt/lib -levent_core - -# GnuTLS stuff -GNUTLS_NAME = "gnutls" -GNUTLS_CFLAGS = $(shell pkg-config ${GNUTLS_NAME} --cflags) -GNUTLS_LDFLAGS = $(shell pkg-config ${GNUTLS_NAME} --libs) - -# evsql stuff -EVSQL_CFLAGS = -EVSQL_LDFLAGS = -levsql -lpq - -BIN_NAMES = nexus test -BIN_PATHS = $(addprefix bin/,$(BIN_NAMES)) - -# modules -module_objs = $(patsubst src/%.c,obj/%.o,$(wildcard src/$(1)/*.c)) - -CORE_OBJS = obj/error.o obj/log.o -SOCK_OBJS = obj/sock.o obj/sock_tcp.o -SOCK_TEST_OBJS = obj/sock_test.o -SOCK_GNUTLS_OBJS = obj/sock_gnutls.o -LINEPROTO_OBJS = obj/line_proto.o -IRC_OBJS = obj/irc_line.o obj/irc_conn.o obj/irc_net.o obj/irc_chan.o obj/chain.o obj/irc_cmd.o obj/irc_proto.o obj/irc_client.o -NEXUS_OBJS = obj/signals.o obj/module.o -IRC_LOG_OBJS = obj/irc_log.o - -# XXX: not yet there -#CORE_OBJS = obj/lib/log.o obj/lib/signals.o - -# first target -all: ${BIN_PATHS} modules/irc_log.so - -# binaries -bin/nexus: ${CORE_OBJS} ${SOCK_OBJS} ${SOCK_GNUTLS_OBJS} ${LINEPROTO_OBJS} ${IRC_OBJS} ${IRC_LOG_OBJS} ${NEXUS_OBJS} - -bin/test: ${CORE_OBJS} ${SOCK_OBJS} ${SOCK_GNUTLS_OBJS} ${SOCK_TEST_OBJS} ${LINEPROTO_OBJS} ${IRC_OBJS} - -modules/irc_log.so: ${CORE_OBJS} - -# computed -CFLAGS = ${MODE_CFLAGS} ${FIXED_CFLAGS} ${LIBEVENT_CFLAGS} ${GNUTLS_CFLAGS} ${EVSQL_CFLAGS} -fpic -LDFLAGS = ${LIBEVENT_LDFLAGS} ${GNUTLS_LDFLAGS} ${EVSQL_LDFLAGS} -Wl,--export-dynamic - -# XXX: is this valid? -CPPFLAGS = ${CFLAGS} - -# names for src/ -SRC_PATHS = $(wildcard src/*.c) $(wildcard src/*/*.c) -SRC_NAMES = $(patsubst src/%,%,$(SRC_PATHS)) -SRC_DIRS = $(dir $(SRC_NAMES)) - -# other targets -clean : - -rm obj/*.o obj/*/*.o - -rm bin/* - -rm build/deps/*.d build/deps/*/*.d - -clean-deps: - -rm build/deps/*/*.d - -rm build/deps/*.d - -#obj-dirs: -# python build/make_obj_dirs.py $(BIN_PATHS) - -build/deps/%.d : src/%.c - @set -e; rm -f $@; \ - $(CC) -MM -MT __ $(CPPFLAGS) $< > $@.$$$$; \ - sed 's,__[ :]*,obj/$*.o $@ : ,g' < $@.$$$$ > $@; \ - rm -f $@.$$$$ - -include $(SRC_NAMES:%.c=build/deps/%.d) - - -# XXX: removed $(CPPFLAGS) -obj/%.o : src/%.c - $(CC) -c $(CFLAGS) $< -o $@ - -bin/% : obj/%.o - $(CC) $(LDFLAGS) $+ $(LOADLIBES) $(LDLIBS) -o $@ - -modules/%.so : obj/%.o - $(CC) -shared -Wl,-soname,$(notdir $@) -o $@ $+ -lc - -# documentation -DOXYGEN_PATH = /usr/bin/doxygen -DOXYGEN_CONF_PATH = doc/doxygen.conf -DOXYGEN_OUTPUT_FILE = doc/html/index.html - -docs : - ${DOXYGEN_PATH} ${DOXYGEN_CONF_PATH} - diff -r 375a3b5c3a46 -r 3c440bebcea7 doc/doxygen.conf.in --- a/doc/doxygen.conf.in Mon Mar 16 00:03:31 2009 +0200 +++ b/doc/doxygen.conf.in Mon Mar 16 00:06:59 2009 +0200 @@ -534,7 +534,7 @@ # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = @PROJECT_DOX_FILE@ @PROJECT_SOURCECODE_DIR@ +INPUT = @PROJECT_DOX_FILE@ @PROJECT_SOURCE_DIR@/src # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is