diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2002-02-25 14:08:18 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2002-02-25 14:08:18 +0000 |
| commit | e6ed3478ea5a3ae191b244814a273c566d432f39 (patch) | |
| tree | b945c4057835ae31608c394afeb5c6f8ff3dcb38 | |
| parent | db08d9c6b9af6faa4613e60d4db4b0da0bb3f615 (diff) | |
automake usage and options cleanup
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | lib/Makefile.am | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 25 | ||||
| -rw-r--r-- | tests/server/Makefile.am | 2 |
4 files changed, 13 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index fc6d808c7..f9f40550b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ # $Id$ # -AUTOMAKE_OPTIONS = foreign no-dependencies +AUTOMAKE_OPTIONS = foreign EXTRA_DIST = \ CHANGES LEGAL maketgz MITX.txt MPL-1.1.txt \ diff --git a/lib/Makefile.am b/lib/Makefile.am index 4db5906c1..c80e4a8e8 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,7 +2,7 @@ # $Id$ # -AUTOMAKE_OPTIONS = foreign no-dependencies +AUTOMAKE_OPTIONS = foreign nostdinc EXTRA_DIST = getdate.y \ Makefile.b32 Makefile.b32.resp Makefile.m32 Makefile.vc6 \ @@ -14,7 +14,6 @@ lib_LTLIBRARIES = libcurl.la INCLUDES = -I$(top_srcdir)/include - libcurl_la_LDFLAGS = -no-undefined -version-info 2:2:0 # This flag accepts an argument of the form current[:revision[:age]]. So, # passing -version-info 3:12:1 sets current to 3, revision to 12, and age to diff --git a/src/Makefile.am b/src/Makefile.am index 19bed07a0..4a2561799 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,26 +2,26 @@ # $Id$ # -# Some flags needed when trying to cause warnings ;-) -# CFLAGS = -g -DMALLOCDEBUG # -Wall -pedantic -#CPPFLAGS = -DGLOBURL -DCURL_SEPARATORS +AUTOMAKE_OPTIONS = foreign nostdinc INCLUDES = -I$(top_srcdir)/include bin_PROGRAMS = curl #memtest -noinst_HEADERS = setup.h \ +#memtest_SOURCES = memtest.c +#memtest_LDADD = $(top_srcdir)/lib/libcurl.la + +curl_SOURCES = main.c hugehelp.c urlglob.c writeout.c setup.h \ config-win32.h \ config-mac.h \ config-vms.h \ urlglob.h \ version.h \ - writeout.h - -#memtest_SOURCES = memtest.c -#memtest_LDADD = $(top_srcdir)/lib/libcurl.la + writeout.h \ + config-win32.h \ + config-mac.h \ + config-vms.h -curl_SOURCES = main.c hugehelp.c urlglob.c writeout.c curl_LDADD = ../lib/libcurl.la curl_DEPENDENCIES = ../lib/libcurl.la BUILT_SOURCES = hugehelp.c @@ -33,12 +33,7 @@ EXTRA_DIST = mkhelp.pl curlmsg.msg \ macos/curl.mcp.xml.sit.hqx \ macos/MACINSTALL.TXT \ macos/src/curl_GUSIConfig.cpp \ - macos/src/macos_main.cpp \ - config-win32.h \ - config-mac.h \ - config-vms.h - -AUTOMAKE_OPTIONS = foreign no-dependencies + macos/src/macos_main.cpp MANPAGE=$(top_srcdir)/docs/curl.1 README=$(top_srcdir)/docs/MANUAL diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am index 662ae682d..cb98c20e1 100644 --- a/tests/server/Makefile.am +++ b/tests/server/Makefile.am @@ -9,4 +9,4 @@ noinst_PROGRAMS = sws sws_SOURCES= sws.c getpart.c -all: +extra_DIST = config.h.in |