Commit 2aee6d44 authored by Kai Vehmanen's avatar Kai Vehmanen

Build system updates: update to Makefile.am rules.

darcs-hash:20070521152559-77cd4-3d01984a162dfcfada23658039c35901b26e0f88.gz
parent a1db26c4
......@@ -22,11 +22,12 @@ COMMON_LDADD = libagent.la $(GLIB_LIBS)
noinst_LTLIBRARIES = libagent.la
%-signals-marshal.h: %-signals-marshal.list
glib-genmarshal --header --prefix=$(subst -,_,$*)_marshal $< > $*-signals-marshal.h
glib-genmarshal --header --prefix=$(subst -,_,$*)_marshal $< > $@
%-signals-marshal.c: %-signals-marshal.list
glib-genmarshal --body --prefix=$(subst -,_,$*)_marshal $< > $*-signals-marshal.c
sed -i "1i#include \"$*-signals-marshal.h\"" $*-signals-marshal.c
%-signals-marshal.c: %-signals-marshal.list Makefile.am
glib-genmarshal --body --prefix=$(subst -,_,$*)_marshal $< > $@
sed -i "1i#include \"$*-signals-marshal.h\"" $@
sed -ie 's/^}$$/(void)return_value;(void)invocation_hint;}/' $@
BUILT_SOURCES = \
agent-signals-marshal.h \
......@@ -40,9 +41,14 @@ libagent_la_SOURCES = \
component.h \
component.c \
agent.h \
agent-priv.h \
agent.c \
stream.h \
stream.c \
conncheck.c \
conncheck.h \
discovery.c \
discovery.h \
$(BUILT_SOURCES)
libagent_la_LIBADD = \
......@@ -55,11 +61,15 @@ check_PROGRAMS = \
test \
test-add-remove-stream \
test-recv \
test-send \
test-stun \
test-priority \
test-poll \
test-mainloop
test-mainloop \
test-fullmode
# disabled test programs (using the old STUN API):
noinst_PROGRAMS = \
test-stun \
test-send
TESTS = $(check_PROGRAMS)
......@@ -79,5 +89,7 @@ test_poll_LDADD = $(COMMON_LDADD)
test_mainloop_LDADD = $(COMMON_LDADD)
test_fullmode_LDADD = $(COMMON_LDADD)
pkginclude_HEADERS = agent.h candidate.h
......@@ -5,8 +5,6 @@ ERROR_CFLAGS = \
-Wextra \
-Wundef \
-Wnested-externs \
-Wvolatile-register-var \
-Wno-missing-field-initializers \
-Wwrite-strings \
-Wpointer-arith \
-Wbad-function-cast \
......
......@@ -56,7 +56,10 @@ ice_test_server_LDADD = $(COMMON_LDADD)
jingle_test_server_LDADD = $(COMMON_LDADD)
check_PROGRAMS = \
test-readline \
test-readline
# XXX: test programs disabled due to changes in API
EXTRA_PROGRAMS = \
test-util
test_readline_SOURCES = test-readline.c readline.h readline.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment