Changeset 80

Timestamp:

04/04/08 20:08:33 (4 years ago)

Author:

alonbl

Message:

Fix separate builddir issues

Location:

branches/alonbl/mingw

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• doc/Makefile.am (modified) (1 diff)
• doc/nonpersistent/Makefile.am (modified) (3 diffs)
• src/Makefile.am (modified) (3 diffs)

branches/alonbl/mingw/Makefile.am

@@ -2 +2 @@
 AUTOMAKE_OPTIONS = foreign 1.10
 MAINTAINERCLEANFILES = \
-        Makefile.in config.h.in config.h.in~ configure \
-        install-sh ltmain.sh missing mkinstalldirs \
-        compile depcomp config.log config.status \
-        config.guess config.sub acinclude.m4 aclocal.m4 \
-        config.log configure \
-        packaged
+        config.log config.status \
+        $(srcdir)/Makefile.in \
+        $(srcdir)/config.h.in $(srcdir)/config.h.in~ $(srcdir)/configure \
+        $(srcdir)/install-sh $(srcdir)/ltmain.sh $(srcdir)/missing \
+        $(srcdir)/depcomp $(srcdir)/aclocal.m4 \
+        $(srcdir)/config.guess $(srcdir)/config.sub \
+        $(srcdir)/packaged
 EXTRA_DIST = svnignore
 

branches/alonbl/mingw/configure.ac

@@ -84 +84 @@
 )
 
-usrlibdir="/usr/lib${libdir##*/lib}"
-
 AC_ARG_WITH(
         [enginesdir],
         [AC_HELP_STRING([--with-enginesdir], [OpenSSL engines directory. @<:@/usr/lib/engines@:>@])],
         [enginesdir="${withval}"],
-        [enginesdir="${usrlibdir}/engines"]
+        [enginesdir="\$(libdir)/engines"]
 )
 

branches/alonbl/mingw/doc/Makefile.am

@@ -1 @@
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
 if ENABLE_DOC

branches/alonbl/mingw/doc/nonpersistent/Makefile.am

@@ -1 @@
-MAINTAINERCLEANFILES = Makefile.in ChangeLog ChangeLog.tmp
+MAINTAINERCLEANFILES = \
+        $(srcdir)/Makefile.in $(srcdir)/ChangeLog
+DISTCLEANFILES = \
+        ChangeLog ChangeLog.tmp 
 
 wikidir=$(htmldir)/wiki
@@ -14 +17 @@
         WGET="$(WGET)" WGET_OPTS="$(WGET_OPTS)" SED="$(SED)" TR="$(TR)" XSLTPROC="$(XSLTPROC)" \
                 PROJECT="@PACKAGE_NAME@" \
-                $(SHELL) "$(srcdir)/export-wiki.sh" "$(srcdir)" "$(srcdir)/wiki.tmp"
+                $(SHELL) "$(srcdir)/export-wiki.sh" "$(srcdir)" "wiki.tmp"
         mv wiki.tmp wiki.out
 
 ChangeLog:
         test -n "$(SVN)" -a -n "$(XSLTPROC)"
-        if test -d .svn; then \
+        if test -d "$(top_srcdir)/.svn"; then \
                 $(SVN) --verbose --xml log "$(top_srcdir)" | \
                         $(XSLTPROC) --nonet --stringparam linelen 75 \
@@ -31 +34 @@
         mv ChangeLog.tmp ChangeLog
 
+else
+
+wiki.out/*:
+        $(LN_S) "$(srcdir)/wiki.out" wiki.out
+
+ChangeLog:
+        $(LN_S) "$(srcdir)/ChangeLog" ChangeLog
+
 endif
 
+distclean-local:
+        -rm -rf wiki.out wiki.tmp
+
 maintainer-clean-local:
-        rm -rf wiki.out wiki.tmp
+        -rm -rf "$(srcdir)/wiki.out"

branches/alonbl/mingw/src/Makefile.am

@@ -1 @@
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 EXTRA_DIST = Makefile.mak engine_pkcs11.def 
 
@@ -20 +20 @@
 engine_pkcs11_la_LDFLAGS = $(AM_LDFLAGS) $(OPENSSL_EXTRA_LDFLAGS) \
         -module -avoid-version \
-        -export-symbols engine_pkcs11.exports \
+        -export-symbols "$(srcdir)/engine_pkcs11.exports" \
         -no-undefined
 
@@ -33 +33 @@
 
 .rc.lo:
-        $(LTRCCOMPILE) -i $< -o $@
+        $(LTRCCOMPILE) -i "$<" -o "$@"
 
 .rc.o:
-        $(RCCOMPILE) -i $< -o $@
+        $(RCCOMPILE) -i "$<" -o "$@"