Revert "Update to 7.44.0"

[platform/upstream/curl.git] / tests / server / Makefile.am

diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am
index 9b20d5c..7533a98 100644 (file)
--- a/tests/server/Makefile.am
+++ b/tests/server/Makefile.am
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -18,29 +18,47 @@
 # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 # KIND, either express or implied.
 #
-# $Id$
 ###########################################################################
+AUTOMAKE_OPTIONS = foreign nostdinc
 
+# Specify our include paths here, and do it relative to $(top_srcdir) and
+# $(top_builddir), to ensure that these paths which belong to the library
+# being currently built and tested are searched before the library which
+# might possibly already be installed in the system.
+#
+# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h
+# $(top_builddir)/include for generated curlbuild.h inc. from lib/curl_setup.h
+# $(top_srcdir)/include is for libcurl's external include files
+# $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file
+# $(top_srcdir)/lib for libcurl's lib/curl_setup.h and other "borrowed" files
+# $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file
+# $(top_srcdir)/ares is for in-tree c-ares's external include files
 
+if USE_EMBEDDED_ARES
+AM_CPPFLAGS = -I$(top_builddir)/include/curl \
+              -I$(top_builddir)/include      \
+              -I$(top_srcdir)/include        \
+              -I$(top_builddir)/lib          \
+              -I$(top_srcdir)/lib            \
+              -I$(top_builddir)/ares         \
+              -I$(top_srcdir)/ares
+else
+AM_CPPFLAGS = -I$(top_builddir)/include/curl \
+              -I$(top_builddir)/include      \
+              -I$(top_srcdir)/include        \
+              -I$(top_builddir)/lib          \
+              -I$(top_srcdir)/lib
+endif
 
-AUTOMAKE_OPTIONS = foreign
-
-INCLUDES = -I$(top_srcdir)/include \
-           -I$(top_builddir)/lib   \
-           -I$(top_srcdir)/lib 
-
-noinst_PROGRAMS = sws getpart sockfilt resolve tftpd
+# Prevent LIBS from being used for all link targets
+LIBS = $(BLANK_AT_MAKETIME)
 
-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
+if DOING_NATIVE_WINDOWS
+AM_CPPFLAGS += -DCURL_STATICLIB
+endif
 
-resolve_SOURCES= resolve.c util.c util.h $(useful)
-sws_SOURCES= sws.c util.c util.h $(useful)
-sockfilt_SOURCES = sockfilt.c util.c util.h $(useful)  \
- $(top_srcdir)/lib/inet_pton.c
-getpart_SOURCES= testpart.c $(useful)
-tftpd_SOURCES = tftpd.c util.c util.h $(useful) tftp.h
+# Makefile.inc provides neat definitions
+include Makefile.inc
 
-extra_DIST = base64.pl
+EXTRA_DIST = base64.pl Makefile.inc