Deleted Added
full compact
Makefile.win (302408) Makefile.win (362181)
1# PROGRAMS
2# test programs invoked via standard user interface, run on all platforms
3# ALL_TESTS
4# test modules invoked through the abts suite (./testall)
5# OTHER_PROGRAMS
6# programs such as sendfile, that have to be invoked in a special sequence
7# or with special parameters
8

--- 48 unchanged lines hidden (view full) ---

57 $(INTDIR)\testuuid.obj $(INTDIR)\testutil.obj \
58 $(INTDIR)\testbuckets.obj $(INTDIR)\testpass.obj \
59 $(INTDIR)\testmd4.obj $(INTDIR)\testmd5.obj \
60 $(INTDIR)\testldap.obj $(INTDIR)\testdbd.obj \
61 $(INTDIR)\testdbm.obj $(INTDIR)\testreslist.obj \
62 $(INTDIR)\testxml.obj $(INTDIR)\testqueue.obj \
63 $(INTDIR)\testrmm.obj $(INTDIR)\testxlate.obj \
64 $(INTDIR)\testdate.obj $(INTDIR)\testmemcache.obj \
1# PROGRAMS
2# test programs invoked via standard user interface, run on all platforms
3# ALL_TESTS
4# test modules invoked through the abts suite (./testall)
5# OTHER_PROGRAMS
6# programs such as sendfile, that have to be invoked in a special sequence
7# or with special parameters
8

--- 48 unchanged lines hidden (view full) ---

57 $(INTDIR)\testuuid.obj $(INTDIR)\testutil.obj \
58 $(INTDIR)\testbuckets.obj $(INTDIR)\testpass.obj \
59 $(INTDIR)\testmd4.obj $(INTDIR)\testmd5.obj \
60 $(INTDIR)\testldap.obj $(INTDIR)\testdbd.obj \
61 $(INTDIR)\testdbm.obj $(INTDIR)\testreslist.obj \
62 $(INTDIR)\testxml.obj $(INTDIR)\testqueue.obj \
63 $(INTDIR)\testrmm.obj $(INTDIR)\testxlate.obj \
64 $(INTDIR)\testdate.obj $(INTDIR)\testmemcache.obj \
65 $(INTDIR)\testredis.obj $(INTDIR)\testsiphash.obj \
65 $(INTDIR)\testcrypto.obj
66
67CLEAN_DATA = manyfile.bin testfile.txt data\sqlite*.db
68
69CLEAN_BUILDDIRS = Debug Release LibD LibR 9x x64
70
71PROGRAMS = \
72 $(OUTDIR)\testall.exe

--- 11 unchanged lines hidden (view full) ---

84API_PATH = ..\..\apr-iconv
85
86APROUTDIR=$(OUTDIR)
87
88!IF "$(MODEL)" == "static"
89PROGRAM_DEPENDENCIES = \
90 $(APR_PATH)\$(APROUTDIR)\apr-1.lib \
91 $(API_PATH)\$(OUTDIR)\apriconv-1.lib \
66 $(INTDIR)\testcrypto.obj
67
68CLEAN_DATA = manyfile.bin testfile.txt data\sqlite*.db
69
70CLEAN_BUILDDIRS = Debug Release LibD LibR 9x x64
71
72PROGRAMS = \
73 $(OUTDIR)\testall.exe

--- 11 unchanged lines hidden (view full) ---

85API_PATH = ..\..\apr-iconv
86
87APROUTDIR=$(OUTDIR)
88
89!IF "$(MODEL)" == "static"
90PROGRAM_DEPENDENCIES = \
91 $(APR_PATH)\$(APROUTDIR)\apr-1.lib \
92 $(API_PATH)\$(OUTDIR)\apriconv-1.lib \
92 ..\xml\expat\lib\$(OUTDIR)\xml.lib \
93 ..\$(OUTDIR)\aprutil-1.lib
94STATIC_CFLAGS = /D APR_DECLARE_STATIC /D APU_DECLARE_STATIC
93 ..\$(OUTDIR)\aprutil-1.lib
94STATIC_CFLAGS = /D APR_DECLARE_STATIC /D APU_DECLARE_STATIC
95STATIC_LIBS = odbc32.lib odbccp32.lib wldap32.lib
95STATIC_LIBS = libexpatMT.lib odbc32.lib odbccp32.lib wldap32.lib
96!ELSE
97PROGRAM_DEPENDENCIES = \
98 $(APR_PATH)\$(APROUTDIR)\libapr-1.lib \
99 ..\$(OUTDIR)\libaprutil-1.lib
100STATIC_CFLAGS =
101# APR 1.3 doesn't fully abstract ldap_ calls to permit switching providers;
102STATIC_LIBS = wldap32.lib
103!ENDIF

--- 68 unchanged lines hidden ---
96!ELSE
97PROGRAM_DEPENDENCIES = \
98 $(APR_PATH)\$(APROUTDIR)\libapr-1.lib \
99 ..\$(OUTDIR)\libaprutil-1.lib
100STATIC_CFLAGS =
101# APR 1.3 doesn't fully abstract ldap_ calls to permit switching providers;
102STATIC_LIBS = wldap32.lib
103!ENDIF

--- 68 unchanged lines hidden ---