Commit e6ed3478 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

automake usage and options cleanup

parent db08d9c6

Makefile.am

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
# $Id$

# $Id$

#

#





AUTOMAKE_OPTIONS = foreign no-dependencies

AUTOMAKE_OPTIONS = foreign





EXTRA_DIST =						\

EXTRA_DIST =						\

	CHANGES LEGAL maketgz MITX.txt MPL-1.1.txt	\

	CHANGES LEGAL maketgz MITX.txt MPL-1.1.txt	\

lib/Makefile.am

+1 −2
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
# $Id$

# $Id$

#

#





AUTOMAKE_OPTIONS = foreign no-dependencies

AUTOMAKE_OPTIONS = foreign nostdinc





EXTRA_DIST = getdate.y \

EXTRA_DIST = getdate.y \

       Makefile.b32 Makefile.b32.resp Makefile.m32 Makefile.vc6 \

       Makefile.b32 Makefile.b32.resp Makefile.m32 Makefile.vc6 \
@@ -14,7 +14,6 @@ lib_LTLIBRARIES = libcurl.la 




INCLUDES = -I$(top_srcdir)/include

INCLUDES = -I$(top_srcdir)/include







libcurl_la_LDFLAGS = -no-undefined -version-info 2:2:0

libcurl_la_LDFLAGS = -no-undefined -version-info 2:2:0

# This flag accepts an argument of the form current[:revision[:age]]. So,

# 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

# passing -version-info 3:12:1 sets current to 3, revision to 12, and age to

src/Makefile.am

+10 −15
Original line number Original line Diff line number Diff line
@@ -2,26 +2,26 @@ 
# $Id$

# $Id$

#

#





# Some flags needed when trying to cause warnings ;-)

AUTOMAKE_OPTIONS = foreign nostdinc

# CFLAGS = -g -DMALLOCDEBUG # -Wall -pedantic

#CPPFLAGS = -DGLOBURL -DCURL_SEPARATORS





INCLUDES = -I$(top_srcdir)/include

INCLUDES = -I$(top_srcdir)/include





bin_PROGRAMS = curl #memtest

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-win32.h \

	config-mac.h \

	config-mac.h \

	config-vms.h \

	config-vms.h \

	urlglob.h \

	urlglob.h \

	version.h \

	version.h \

	writeout.h

	writeout.h \



	config-win32.h \

#memtest_SOURCES = memtest.c

	config-mac.h \

#memtest_LDADD = $(top_srcdir)/lib/libcurl.la

	config-vms.h	





curl_SOURCES = main.c hugehelp.c urlglob.c writeout.c

curl_LDADD = ../lib/libcurl.la

curl_LDADD = ../lib/libcurl.la

curl_DEPENDENCIES = ../lib/libcurl.la

curl_DEPENDENCIES = ../lib/libcurl.la

BUILT_SOURCES = hugehelp.c

BUILT_SOURCES = hugehelp.c
@@ -33,12 +33,7 @@ EXTRA_DIST = mkhelp.pl curlmsg.msg \ 
	macos/curl.mcp.xml.sit.hqx \

	macos/curl.mcp.xml.sit.hqx \

	macos/MACINSTALL.TXT \

	macos/MACINSTALL.TXT \

	macos/src/curl_GUSIConfig.cpp \

	macos/src/curl_GUSIConfig.cpp \

	macos/src/macos_main.cpp \

	macos/src/macos_main.cpp

	config-win32.h \

	config-mac.h \

	config-vms.h	



AUTOMAKE_OPTIONS = foreign no-dependencies





MANPAGE=$(top_srcdir)/docs/curl.1

MANPAGE=$(top_srcdir)/docs/curl.1

README=$(top_srcdir)/docs/MANUAL

README=$(top_srcdir)/docs/MANUAL

tests/server/Makefile.am

+1 −1
Original line number Original line Diff line number Diff line
@@ -9,4 +9,4 @@ noinst_PROGRAMS = sws 




sws_SOURCES= sws.c getpart.c

sws_SOURCES= sws.c getpart.c





all:
 
extra_DIST = config.h.in