1
0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00

Dependency improvements (but still needs some work).

This commit is contained in:
Micah Cowan 2008-08-22 17:14:31 -07:00
parent 72687f78cb
commit 123f5c3966
2 changed files with 17 additions and 1 deletions

View File

@ -51,6 +51,12 @@ EXTRA_wget_SOURCES = mswindows.c
LDADD = $(LIBOBJS) ../lib/libgnu.a @MD5_LDADD@ LDADD = $(LIBOBJS) ../lib/libgnu.a @MD5_LDADD@
AM_CPPFLAGS = -I$(top_srcdir)/lib @MD5_CPPFLAGS@ AM_CPPFLAGS = -I$(top_srcdir)/lib @MD5_CPPFLAGS@
../lib/libgnu.a:
cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
../md5/libmd5.a:
cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
ESCAPEQUOTE = sed -e 's/[\\"]/\\&/g' -e 's/\\"/"/' -e 's/\\";$$/";/' ESCAPEQUOTE = sed -e 's/[\\"]/\\&/g' -e 's/\\"/"/' -e 's/\\";$$/";/'
version.c: $(wget_SOURCES) $(LDADD) $(srcdir)/Makefile.am version.c: $(wget_SOURCES) $(LDADD) $(srcdir)/Makefile.am
echo '/* version.c */' > $@ echo '/* version.c */' > $@

View File

@ -42,10 +42,19 @@ test: ../src/wget$(EXEEXT) run-unit-tests run-px-tests
../src/wget$(EXEEXT): ../src/wget$(EXEEXT):
cd ../src && $(MAKE) $(AM_MAKEFLAGS) cd ../src && $(MAKE) $(AM_MAKEFLAGS)
../src/libunittest.a:
cd ../src && $(MAKE) $(AM_MAKEFLAGS) libunittest.a
../lib/libgnu.a:
cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
../md5/libmd5.a:
cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
run-unit-tests: unit-tests$(EXEEXT) run-unit-tests: unit-tests$(EXEEXT)
./unit-tests$(EXEEXT) ./unit-tests$(EXEEXT)
run-px-tests: WgetTest.pm run-px-tests: WgetTest.pm ../src/wget$(EXEEXT)
./run-px $(top_srcdir) ./run-px $(top_srcdir)
EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \ EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \
@ -62,6 +71,7 @@ EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \
check_PROGRAMS = unit-tests check_PROGRAMS = unit-tests
unit_tests_SOURCES = unit_tests_SOURCES =
#unit-tests: ../src/libunittest.a ../lib/libgnu.a
LDADD = ../src/libunittest.a ../lib/libgnu.a @LIBSSL@ @LIBGNUTLS@ \ LDADD = ../src/libunittest.a ../lib/libgnu.a @LIBSSL@ @LIBGNUTLS@ \
@MD5_LDADD@ @MD5_LDADD@