← Back to branch summary

~ubuntu-branches/ubuntu/lucid/curl/lucid

« back to all changes in this revision

Viewing changes to tests/server/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2009-12-11 19:33:21 UTC
  • mfrom: (3.4.2 squeeze) (40.1.2 curl)
  • Revision ID: james.westby@ubuntu.com-20091211193321-tenukopudyznzbjj
Tags: 7.19.7-1ubuntu1
* Merge with Debian testing.  Remaining changes:
  - Keep build deps in main:
    - Drop build dependencies: stunnel, libdb4.6-dev, libssh2-1-dev
    - Add build-dependency on openssh-server
    - Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/server/Makefile.am
18
18
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
19
19
# KIND, either express or implied.
20
20
#
21
 
# $Id: Makefile.am,v 1.26 2009-04-29 00:38:08 yangtse Exp $
 
21
# $Id: Makefile.am,v 1.28 2009-07-14 13:25:15 gknauf Exp $
22
22
###########################################################################
23
23
AUTOMAKE_OPTIONS = foreign nostdinc
24
24
 
29
29
#
30
30
# $(top_builddir)/include is for libcurl's generated curl/curlbuild.h file
31
31
# $(top_srcdir)/include is for libcurl's external include files
32
 
# $(top_builddir)/lib is for libcurl's generated lib/config.h file
 
32
# $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file
33
33
# $(top_srcdir)/lib is for libcurl's lib/setup.h and other "borrowed" files
34
34
# $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file
35
35
# $(top_srcdir)/ares is for in-tree c-ares's external include files
36
36
 
 
37
if USE_EMBEDDED_ARES
37
38
INCLUDES = -I$(top_builddir)/include \
38
39
           -I$(top_srcdir)/include   \
39
40
           -I$(top_builddir)/lib     \
40
41
           -I$(top_srcdir)/lib       \
41
42
           -I$(top_builddir)/ares    \
42
43
           -I$(top_srcdir)/ares
 
44
else
 
45
INCLUDES = -I$(top_builddir)/include \
 
46
           -I$(top_srcdir)/include   \
 
47
           -I$(top_builddir)/lib     \
 
48
           -I$(top_srcdir)/lib
 
49
endif
43
50
 
44
51
# Makefile.inc provides the source defines (noinst_PROGRAMS, useful, *_SOURCES, and *_LDADD)
45
52
include Makefile.inc