build changes for MinGW: avoid explicit dllimport/dllexport in compiling libltdl...

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index 72ddddd802bea9370281fc1e8d4c946bf6e348bd..eb3f4ea0c68bbeb6f02ffdf7dc02fdfc3f40764a 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -5,7 +5,7 @@ pdfdir = $(pkgdatadir)/doc/pdf
 
 linkedman = neato.1 twopi.1 fdp.1 circo.1
 linkedpdf = neato.pdf twopi.pdf fdp.pdf circo.pdf
-linkedprogram = neato twopi fdp circo
+linkedprogram = neato$(EXEEXT) twopi$(EXEEXT) fdp$(EXEEXT) circo$(EXEEXT)
 
 AM_CPPFLAGS = \
         -I$(top_srcdir)/lib/common \
@@ -50,8 +50,8 @@ install-data-hook:
 # create "neato", "fdp" etc as soflinks to "dot"
 # run "dot -c", if possible, to create plugin config
 install-exec-hook:
-       (cd $(DESTDIR)$(bindir); for i in $(linkedprogram); do rm -f $$i; $(LN_S) dot $$i; done;)
-       if test "x$(DESTDIR)" = "x"; then if test -x $(bindir)/dot; then if test -x /sbin/ldconfig; then /sbin/ldconfig 2>/dev/null; fi; $(bindir)/dot -c; else $(bindir)/dot_static -c; fi; fi
+       (cd $(DESTDIR)$(bindir); for i in $(linkedprogram); do rm -f $$i; $(LN_S) dot$(EXEEXT) $$i; done;)
+       if test "x$(DESTDIR)" = "x"; then if test -x $(bindir)/dot$(EXEEXT); then if test -x /sbin/ldconfig; then /sbin/ldconfig 2>/dev/null; fi; $(bindir)/dot$(EXEEXT) -c; else $(bindir)/dot_static$(EXEEXT) -c; fi; fi
 
 uninstall-hook:
        (cd $(DESTDIR)$(man1dir); for i in $(linkedman); do rm -f $$i; done;)

diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
index 7da36565349a8404feb2dbfdc465ecd4e0aafa98..97edb963db7fe226ba30163292ca42a7e0f106ff 100644 (file)
--- a/cmd/tools/Makefile.am
+++ b/cmd/tools/Makefile.am
@@ -28,12 +28,12 @@ install-data-hook:
        (cd $(DESTDIR)$(pdfdir); rm -f dot2gxl.pdf; $(LN_S) gxl2dot.pdf dot2gxl.pdf;)
 
 install-exec-hook:
-       (cd $(DESTDIR)$(bindir); rm -f dot2gxl; $(LN_S) gxl2dot dot2gxl;)
+       (cd $(DESTDIR)$(bindir); rm -f dot2gxl$(EXEEXT); $(LN_S) gxl2dot$(EXEEXT) dot2gxl$(EXEEXT);)
 
 uninstall-hook:
        (cd $(DESTDIR)$(man1dir); rm -f dot2gxl.1;)
        (cd $(DESTDIR)$(pdfdir); rm -f dot2gxl.pdf;)
-       (cd $(DESTDIR)$(bindir); rm -f dot2gxl;)
+       (cd $(DESTDIR)$(bindir); rm -f dot2gxl$(EXEEXT);)
 
 gxl2dot_SOURCES = cvtgxl.c dot2gxl.c gxl2dot.c