1 --- stunnel-4.04/src/Makefile.am.orig Sun Jan 12 19:16:35 2003
2 +++ stunnel-4.04/src/Makefile.am Sun Jan 12 19:17:30 2003
4 libstunnel_la_SOURCES = $(shared_sources)
5 libstunnel_la_LDFLAGS = -avoid-version
9 -EXTRA_DIST = stunnel.exe make.bat Makefile.w32
10 -EXTRA_PROGRAMS = stunnel.exe
11 -stunnel_exe_SOURCES = $(common_headers) $(common_sources) $(win32_sources)
13 -OPENSSLDIR=/usr/src/openssl-0.9.7
14 -WINCFLAGS=-O2 -Wall -I$(OPENSSLDIR)/outinc \
15 - -DUSE_WIN32=1 -DHAVE_OPENSSL=1 -DVERSION=\"@VERSION@\"
16 -WINLIBS=-L$(OPENSSLDIR)/out -leay32 -lssl32 -lwsock32 -lgdi32 -mwindows
17 -WINOBJ=client.obj log.obj options.obj protocol.obj sselect.obj \
18 - ssl.obj sthreads.obj stunnel.obj gui.obj resources.obj
19 -WINGCC=i586-mingw32msvc-gcc
20 -WINDRES=i586-mingw32msvc-windres
22 SUFFIXES = .c .rc .obj
24 -stunnel.exe: $(WINOBJ)
25 - $(WINGCC) -s -o stunnel.exe $(WINOBJ) $(WINLIBS)
27 .c.obj: $(common_headers)
28 $(WINGCC) $(WINCFLAGS) -c $< -o $@
30 --- stunnel-4.04/tools/Makefile.am Sun Jan 12 05:22:12 2003
31 +++ stunnel-4.04/tools/Makefile.am.new Sun Jan 12 19:22:57 2003
33 then dd if="$(RANDOM_FILE)" of=stunnel.rnd bs=256 count=1; \
34 RND="-rand stunnel.rnd"; \
36 - $(openssl) req -new -x509 -days 365 -nodes $$RND \
37 + echo -e "\n\n\n\n\n\n" | $(openssl) req -new -x509 -days 365 -nodes $$RND \
38 -config $(srcdir)/stunnel.cnf -out stunnel.pem -keyout stunnel.pem; \
39 test $(USE_DH) -eq 0 || $(openssl) gendh $$RND 512 >> stunnel.pem
40 $(openssl) x509 -subject -dates -fingerprint -noout \
45 - chmod 0600 $(confdir)/stunnel.pem
46 + chmod 0600 $(DESTDIR)$(confdir)/stunnel.pem