From 24b390c2e941c6824f43c11df28ad1603832b9d1 Mon Sep 17 00:00:00 2001 From: glenlow Date: Sat, 23 Feb 2008 00:48:35 +0000 Subject: [PATCH] build changes for MinGW: avoid explicit dllimport/dllexport in compiling libltdl, lib/gd, plugin/gd; plugin linking with -no-undefined + dependent libs to force DLL creation; plugins installed into lib instead of lib/graphviz in Windows; install symlinks with .exe extension in Windows --- cmd/dot/Makefile.am | 6 +++--- cmd/tools/Makefile.am | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am index 72ddddd80..eb3f4ea0c 100644 --- 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 7da365653..97edb963d 100644 --- 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 -- 2.40.0