automake usage and options cleanup

diff --git a/Makefile.am b/Makefile.am
index fc6d808c798bb05fbc6eac89fd5a878c83d6bbdb..f9f40550b015b979793ae1eb3c5f64b1bc419ad6 100644 (file)
--- 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 4db5906c14535968eb29c314c14ca68deeba4924..c80e4a8e81f210d0f7f1a14b6231d6d97469a5cb 100644 (file)
--- 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 19bed07a09030ab58e57172088eb82a021583fd7..4a2561799805a6d14e31313e3eae4a2f86751031 100644 (file)
--- 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 662ae682d925f2e2bb3582c126b0cfeb8a99fb99..cb98c20e1029f0e0ac5546f5f2b4c0d716f2b997 100644 (file)
--- 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