diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2001-01-08 10:00:14 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2001-01-08 10:00:14 +0000 |
| commit | 044ca343adbd4686b6ef71ebfb087e7dcceffe61 (patch) | |
| tree | 5e1e461eab790a0cef0c396acbfe72a763fc5b1a /lib | |
| parent | f59ea9adb3b6cecad5218e9970bc7ca48ffdd2b2 (diff) | |
Loic Dachary's makefile/dist/rpm fixes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 8 | ||||
| -rw-r--r-- | lib/Makefile.in | 11 | ||||
| -rw-r--r-- | lib/ftp.c | 1 |
3 files changed, 17 insertions, 3 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 145a9ba27..2090cb013 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -4,6 +4,10 @@ AUTOMAKE_OPTIONS = foreign +EXTRA_DIST = getdate.y \ + Makefile.b32 Makefile.b32.resp Makefile.m32 Makefile.vc6 \ + libcurl.def dllinit.c + lib_LTLIBRARIES = libcurl.la # Some flags needed when trying to cause warnings ;-) @@ -54,7 +58,9 @@ download.h getenv.c ldap.h ssluse.h \ escape.c getenv.h mprintf.c telnet.c \ escape.h getpass.c netrc.c telnet.h \ getinfo.c highlevel.c strequal.c strequal.h easy.c \ -security.h security.c krb4.c memdebug.c memdebug.h +security.h security.c krb4.c memdebug.c memdebug.h inet_ntoa_r.h + +noinst_HEADERS = setup.h highlevel.h # Say $(srcdir), so GNU make does not report an ambiguity with the .y.c rule. $(srcdir)/getdate.c: getdate.y diff --git a/lib/Makefile.in b/lib/Makefile.in index ba0fd3333..291172d88 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -79,6 +79,9 @@ YACC = @YACC@ AUTOMAKE_OPTIONS = foreign +EXTRA_DIST = getdate.y Makefile.b32 Makefile.b32.resp Makefile.m32 Makefile.vc6 libcurl.def dllinit.c + + lib_LTLIBRARIES = libcurl.la # Some flags needed when trying to cause warnings ;-) @@ -115,8 +118,10 @@ libcurl_la_LDFLAGS = -version-info 1:0:0 # set age to 0. # -libcurl_la_SOURCES = arpa_telnet.h file.c getpass.h netrc.h timeval.c base64.c file.h hostip.c progress.c timeval.h base64.h formdata.c hostip.h progress.h cookie.c formdata.h http.c sendf.c cookie.h ftp.c http.h sendf.h url.c dict.c ftp.h if2ip.c speedcheck.c url.h dict.h getdate.c if2ip.h speedcheck.h urldata.h download.c getdate.h ldap.c ssluse.c version.c download.h getenv.c ldap.h ssluse.h escape.c getenv.h mprintf.c telnet.c escape.h getpass.c netrc.c telnet.h getinfo.c highlevel.c strequal.c strequal.h easy.c security.h security.c krb4.c memdebug.c memdebug.h +libcurl_la_SOURCES = arpa_telnet.h file.c getpass.h netrc.h timeval.c base64.c file.h hostip.c progress.c timeval.h base64.h formdata.c hostip.h progress.h cookie.c formdata.h http.c sendf.c cookie.h ftp.c http.h sendf.h url.c dict.c ftp.h if2ip.c speedcheck.c url.h dict.h getdate.c if2ip.h speedcheck.h urldata.h download.c getdate.h ldap.c ssluse.c version.c download.h getenv.c ldap.h ssluse.h escape.c getenv.h mprintf.c telnet.c escape.h getpass.c netrc.c telnet.h getinfo.c highlevel.c strequal.c strequal.h easy.c security.h security.c krb4.c memdebug.c memdebug.h inet_ntoa_r.h + +noinst_HEADERS = setup.h highlevel.h mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h ../src/config.h CONFIG_CLEAN_FILES = @@ -138,6 +143,8 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CF LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +HEADERS = $(noinst_HEADERS) + DIST_COMMON = Makefile.am Makefile.in @@ -288,7 +295,7 @@ install-am: all-am install: install-am uninstall-am: uninstall-libLTLIBRARIES uninstall: uninstall-am -all-am: Makefile $(LTLIBRARIES) +all-am: Makefile $(LTLIBRARIES) $(HEADERS) all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install @@ -26,6 +26,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> +#include <stdarg.h> #include <ctype.h> #include <errno.h> |