← Back to branch summary

~ubuntu-branches/ubuntu/maverick/curl/maverick

« back to all changes in this revision

Viewing changes to include/curl/Makefile.in

  • 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
* 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:
include/curl/Makefile.in
51
51
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
52
52
        $(ACLOCAL_M4)
53
53
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
54
 
CONFIG_HEADER = $(top_builddir)/lib/config.h \
55
 
        $(top_builddir)/src/config.h curlbuild.h
 
54
CONFIG_HEADER = $(top_builddir)/lib/curl_config.h \
 
55
        $(top_builddir)/src/curl_config.h curlbuild.h
56
56
CONFIG_CLEAN_FILES =
57
57
SOURCES =
58
58
DIST_SOURCES =
86
86
CPPFLAGS = @CPPFLAGS@
87
87
CROSSCOMPILING_FALSE = @CROSSCOMPILING_FALSE@
88
88
CROSSCOMPILING_TRUE = @CROSSCOMPILING_TRUE@
 
89
CURLDEBUG_FALSE = @CURLDEBUG_FALSE@
 
90
CURLDEBUG_TRUE = @CURLDEBUG_TRUE@
89
91
CURL_CA_BUNDLE = @CURL_CA_BUNDLE@
90
92
CURL_DISABLE_DICT = @CURL_DISABLE_DICT@
91
93
CURL_DISABLE_FILE = @CURL_DISABLE_FILE@
152
154
PACKAGE_NAME = @PACKAGE_NAME@
153
155
PACKAGE_STRING = @PACKAGE_STRING@
154
156
PACKAGE_TARNAME = @PACKAGE_TARNAME@
 
157
PACKAGE_URL = @PACKAGE_URL@
155
158
PACKAGE_VERSION = @PACKAGE_VERSION@
156
159
PATH = @PATH@
157
160
PATH_SEPARATOR = @PATH_SEPARATOR@
175
178
SUPPORT_FEATURES = @SUPPORT_FEATURES@
176
179
SUPPORT_PROTOCOLS = @SUPPORT_PROTOCOLS@
177
180
TEST_SERVER_LIBS = @TEST_SERVER_LIBS@
 
181
USE_EMBEDDED_ARES_FALSE = @USE_EMBEDDED_ARES_FALSE@
 
182
USE_EMBEDDED_ARES_TRUE = @USE_EMBEDDED_ARES_TRUE@
178
183
USE_GNUTLS = @USE_GNUTLS@
179
184
USE_LIBSSH2 = @USE_LIBSSH2@
180
185
USE_MANUAL_FALSE = @USE_MANUAL_FALSE@
265
270
              exit 1;; \
266
271
          esac; \
267
272
        done; \
268
 
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  include/curl/Makefile'; \
 
273
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/curl/Makefile'; \
269
274
        cd $(top_srcdir) && \
270
 
          $(AUTOMAKE) --foreign  include/curl/Makefile
 
275
          $(AUTOMAKE) --gnu  include/curl/Makefile
271
276
.PRECIOUS: Makefile
272
277
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
273
278
        @case '$?' in \