Commit 044ca343 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Loic Dachary's makefile/dist/rpm fixes

parent f59ea9ad

CHANGES

+6 −0
Original line number Diff line number Diff line
@@ -6,6 +6,12 @@ 


                               History of Changes



Loic Dachary (6 January 2001)

- Automated generation of rpm packages, no need to be root.



- make distcheck generates a proper distribution (EXTRA_DIST

  in all Makefile.am modified to match FILES).



Daniel (5 January 2001)

- Huge client-side hack: now multiple URLs are supported. Any number of URLs

  can be specified on the command line, and they'll all be downloaded. There

Makefile.am

+27 −1
Original line number Diff line number Diff line
@@ -4,9 +4,35 @@ 


AUTOMAKE_OPTIONS = foreign no-dependencies



EXTRA_DIST = curl.spec curl-ssl.spec

EXTRA_DIST = curl.spec curl-ssl.spec \

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

	config-win32.h reconf 



SUBDIRS = docs lib src include tests



test:

	@(cd tests; make quiet-test)



# Build source and binary rpms. For rpm-3.0 and above, the ~/.rpmmacros

# must contain the following line:

# %_topdir /home/loic/local/rpm

# and that /home/loic/local/rpm contains the directory SOURCES, BUILD etc.

#

# If additional configure flags are needed to build the package, add the

# following in ~/.rpmmacros

# %configure CFLAGS="%{optflags}" ./configure %{_target_platform} --prefix=%{_prefix} ${AM_CONFIGFLAGS}

# and run make rpm in the following way:

# AM_CONFIGFLAGS='--with-uri=/home/users/loic/local/RedHat-6.2' make rpm

#



rpms:

	$(MAKE) RPMDIST=curl rpm

	$(MAKE) RPMDIST=curl-ssl rpm



rpm:

	RPM_TOPDIR=`rpm --showrc | $(PERL) -n -e 'print if(s/.*_topdir\s+(.*)/$$1/)'` ; \

	cp $(srcdir)/$(RPMDIST).spec $$RPM_TOPDIR/SPECS ; \

	cp $(PACKAGE)-$(VERSION).tar.gz $$RPM_TOPDIR/SOURCES ; \

	rpm -ba --clean --rmsource $$RPM_TOPDIR/SPECS/$(RPMDIST).spec ; \

	mv $$RPM_TOPDIR/RPMS/i386/$(RPMDIST)-*.rpm . ; \

	mv $$RPM_TOPDIR/SRPMS/$(RPMDIST)-*.src.rpm .

configure.in

+3 −1
Original line number Diff line number Diff line
@@ -613,7 +613,9 @@ AC_OUTPUT( Makefile \ 
	   include/curl/Makefile \

	   src/Makefile \

           lib/Makefile \

           tests/Makefile)

           tests/Makefile \

	   curl.spec \

	   curl-ssl.spec)

dnl	   perl/checklinks.pl \

dnl	   perl/getlinks.pl \

dnl        perl/formfind.pl \

docs/Makefile.am

+5 −2
Original line number Diff line number Diff line
@@ -12,11 +12,14 @@ man_MANS = \ 
	curl_easy_perform.3 \

	curl_easy_setopt.3 \

	curl_formparse.3 \

	curl_formfree.3 \

	curl_getdate.3 \

	curl_getenv.3 \

	curl_slist_append.3 \

	curl_slist_free_all.3 \

	curl_version.3



EXTRA_DIST = $(man_MANS)

EXTRA_DIST = $(man_MANS) \

	MANUAL BUGS CONTRIBUTE FAQ FEATURES INTERNALS \

	LIBCURL README.win32 RESOURCES TODO TheArtOfHttpScripting \

	examples/README examples/*.c

lib/Makefile.am

+7 −1
Original line number Diff line number Diff line
@@ -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