diff options
| author | Jeff Trawick <trawick@apache.org> | 2011-04-02 13:50:07 +0000 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2011-04-02 13:50:07 +0000 |
| commit | 82633d4457b280518f71372c43663f1c2f285543 (patch) | |
| tree | 02125e627b4888b5110e4df7796bcbe6b0c2edf8 /test | |
| parent | 9f3a2c2076b57d3b8136b06c62698183ef1cbcad (diff) | |
| download | apr-82633d4457b280518f71372c43663f1c2f285543.tar.gz | |
MinGW/MSYS: Support shared builds of APR, other general improvements
to support of this toolchain.
test/Makefile.in:
* $(LT_LDFLAGS) must be placed after the driver, otherwise it will act exactly
like $(LTFLAGS). This is required, otherwise libtool will be never able to
recognize the "-no-undefined" flag.
* if mod_test.la does not specify $(LOCAL_LIBS), compilation will fail (this is
required by both static and shared builds).
include/apr.h.in:
* It is required to declare APR_DECLARE, APR_DECLARE_NONSTD and
APR_DECLARE_DATA as they are in apr.hw, otherwise the generate DLL won't export
any symbol. APR_MODULE_DECLARE_DATA is already included, but previous ones are
not.
configure.in:
* $(LT_LDFLAGS) must be placed after the driver, as described for
test/Makefile.in.
* Added "-no-undefined" flag to $(LT_LDFLAGS) if the target platform is
Windows.
* Declare APR_DECLARE_EXPORT or APR_DECLARE_STATIC, required by the macro added
in include/apr.h.in.
* Removed the "strange" libraries detection (btw, probably it was also breaking
platforms without __stdcall calling convention, like Windows CE/Mobile/Phone,
since function names were decorated), linker gave error without sense if adding
"-lkernel32", probably because it creates a conflict of library precedence and
dependency.
PR: 46175
Submitted by: Carlo Bramini <carlo.bramix libero.it>
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1088023 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index ca1e53bd3..2c8f17257 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -74,7 +74,7 @@ INCLUDES=-I$(INCDIR) -I$(srcdir)/../include # link programs using -no-install to get real executables not # libtool wrapper scripts which link an executable when first run. -LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) \ +LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \ @LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@ # STDTEST_PORTABLE; @@ -126,10 +126,10 @@ mod_test.lo: $(srcdir)/mod_test.c -c $(srcdir)/mod_test.c OBJECTS_mod_test = mod_test.lo -mod_test.la: $(OBJECTS_mod_test) +mod_test.la: $(OBJECTS_mod_test) $(LOCAL_LIBS) $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath `pwd` -module \ -avoid-version $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ \ - $(OBJECTS_mod_test) + $(OBJECTS_mod_test) $(LOCAL_LIBS) OBJECTS_libmod_test = mod_test.lo $(LOCAL_LIBS) libmod_test.la: $(OBJECTS_libmod_test) |