updated sources

diff --git a/tests/server/Makefile.inc b/tests/server/Makefile.inc
index b9bac82793545fa96407b10fee28eec5648bdfed..88c5ccfaaa8f820bd7e82b3fa84b61d619d4ff15 100644 (file)
--- a/tests/server/Makefile.inc
+++ b/tests/server/Makefile.inc
@@ -1,38 +1,100 @@
-noinst_PROGRAMS = sws getpart sockfilt resolve tftpd rtspd
+noinst_PROGRAMS = getpart resolve rtspd sockfilt sws tftpd
 
-useful = getpart.c getpart.h $(top_srcdir)/lib/strequal.c      \
- $(top_srcdir)/lib/base64.c $(top_srcdir)/lib/mprintf.c                \
- $(top_srcdir)/lib/memdebug.c $(top_srcdir)/lib/timeval.c
+getpart_SOURCES = testpart.c \
+ getpart.c \
+ getpart.h \
+ $(top_srcdir)/lib/base64.c \
+ $(top_srcdir)/lib/base64.h \
+ $(top_srcdir)/lib/curlx.h \
+ $(top_srcdir)/lib/memdebug.c \
+ $(top_srcdir)/lib/memdebug.h \
+ $(top_srcdir)/lib/mprintf.c \
+ $(top_srcdir)/lib/warnless.c \
+ $(top_srcdir)/lib/warnless.h
+getpart_LDADD = @TEST_SERVER_LIBS@
+getpart_CFLAGS = $(AM_CFLAGS)
 
-resolve_SOURCES= resolve.c util.c util.h $(useful)
+resolve_SOURCES = resolve.c \
+ getpart.c \
+ getpart.h \
+ $(top_srcdir)/lib/base64.c \
+ $(top_srcdir)/lib/base64.h \
+ $(top_srcdir)/lib/curlx.h \
+ $(top_srcdir)/lib/memdebug.c \
+ $(top_srcdir)/lib/memdebug.h \
+ $(top_srcdir)/lib/mprintf.c \
+ $(top_srcdir)/lib/warnless.c \
+ $(top_srcdir)/lib/warnless.h
 resolve_LDADD = @TEST_SERVER_LIBS@
 resolve_CFLAGS = $(AM_CFLAGS)
 
-sws_SOURCES= sws.c util.c util.h $(useful) \
+rtspd_SOURCES = rtspd.c \
+ getpart.c \
+ getpart.h \
+ util.c \
+ util.h \
+ $(top_srcdir)/lib/base64.c \
+ $(top_srcdir)/lib/base64.h \
+ $(top_srcdir)/lib/curlx.h \
+ $(top_srcdir)/lib/memdebug.c \
+ $(top_srcdir)/lib/memdebug.h \
+ $(top_srcdir)/lib/mprintf.c \
+ $(top_srcdir)/lib/strequal.c \
+ $(top_srcdir)/lib/timeval.c \
  $(top_srcdir)/lib/warnless.c \
  $(top_srcdir)/lib/warnless.h
-sws_LDADD = @TEST_SERVER_LIBS@
-sws_CFLAGS = $(AM_CFLAGS)
+rtspd_LDADD = @TEST_SERVER_LIBS@
+rtspd_CFLAGS = $(AM_CFLAGS)
 
-sockfilt_SOURCES = sockfilt.c util.c util.h $(useful)  \
+sockfilt_SOURCES = sockfilt.c \
+ getpart.c \
+ getpart.h \
+ util.c \
+ util.h \
+ $(top_srcdir)/lib/base64.c \
+ $(top_srcdir)/lib/base64.h \
+ $(top_srcdir)/lib/curlx.h \
  $(top_srcdir)/lib/inet_pton.c \
+ $(top_srcdir)/lib/memdebug.c \
+ $(top_srcdir)/lib/memdebug.h \
+ $(top_srcdir)/lib/mprintf.c \
+ $(top_srcdir)/lib/timeval.c \
  $(top_srcdir)/lib/warnless.c \
  $(top_srcdir)/lib/warnless.h
 sockfilt_LDADD = @TEST_SERVER_LIBS@
 sockfilt_CFLAGS = $(AM_CFLAGS)
 
-getpart_SOURCES= testpart.c $(useful)
-getpart_LDADD = @TEST_SERVER_LIBS@
-getpart_CFLAGS = $(AM_CFLAGS)
-
-tftpd_SOURCES = tftpd.c util.c util.h $(useful) tftp.h \
+sws_SOURCES = sws.c \
+ getpart.c \
+ getpart.h \
+ util.c \
+ util.h \
+ $(top_srcdir)/lib/base64.c \
+ $(top_srcdir)/lib/base64.h \
+ $(top_srcdir)/lib/curlx.h \
+ $(top_srcdir)/lib/memdebug.c \
+ $(top_srcdir)/lib/memdebug.h \
+ $(top_srcdir)/lib/mprintf.c \
+ $(top_srcdir)/lib/strequal.c \
+ $(top_srcdir)/lib/timeval.c \
  $(top_srcdir)/lib/warnless.c \
  $(top_srcdir)/lib/warnless.h
-tftpd_LDADD = @TEST_SERVER_LIBS@
-tftpd_CFLAGS = $(AM_CFLAGS)
+sws_LDADD = @TEST_SERVER_LIBS@
+sws_CFLAGS = $(AM_CFLAGS)
 
-rtspd_SOURCES = rtspd.c util.c util.h $(useful) \
+tftpd_SOURCES = tftpd.c tftp.h \
+ getpart.c \
+ getpart.h \
+ util.c \
+ util.h \
+ $(top_srcdir)/lib/base64.c \
+ $(top_srcdir)/lib/base64.h \
+ $(top_srcdir)/lib/curlx.h \
+ $(top_srcdir)/lib/memdebug.c \
+ $(top_srcdir)/lib/memdebug.h \
+ $(top_srcdir)/lib/mprintf.c \
+ $(top_srcdir)/lib/timeval.c \
  $(top_srcdir)/lib/warnless.c \
  $(top_srcdir)/lib/warnless.h
-rtspd_LDADD = @TEST_SERVER_LIBS@
-rtspd_CFLAGS = $(AM_CFLAGS)
+tftpd_LDADD = @TEST_SERVER_LIBS@
+tftpd_CFLAGS = $(AM_CFLAGS)