From: Ciprian TEODOROV <ciprian.teodorov@gmail.com>
Date: Thu, 15 Jan 2015 19:24:25 +0000 (+0100)
Subject: Merge remote-tracking branch 'official/master'
X-Git-Tag: TRAVIS_CI_BUILD_EXPERIMENTAL~94^2~1^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67c03ab5e715e9a4202ecf111a6b68f40294853e;p=graphviz

Merge remote-tracking branch 'official/master'

Conflicts:
	lib/sfdpgen/Makefile.am
---

67c03ab5e715e9a4202ecf111a6b68f40294853e
diff --cc configure.ac
index 190f6e13e,f5e74d350..2487d014f
--- a/configure.ac
+++ b/configure.ac
@@@ -3186,8 -3062,9 +3062,10 @@@ AC_CONFIG_FILES(Makefil
  	lib/mingle/Makefile
  	lib/label/Makefile
  	lib/sfdpgen/Makefile
 +	lib/sfdpgen/libsfdp.pc
  	lib/osage/Makefile
+ 	lib/edgepaint/Makefile
+ 	lib/edgepaint/liblab_gamut.pc
  	lib/gvpr/Makefile
  	lib/gvpr/libgvpr.pc
  	lib/circogen/Makefile
diff --cc lib/sfdpgen/Makefile.am
index df84bbb71,e4baa45e5..070adbb60
--- a/lib/sfdpgen/Makefile.am
+++ b/lib/sfdpgen/Makefile.am
@@@ -22,34 -16,15 +22,33 @@@ pkgconfig_DATA = libsfdp.p
  noinst_HEADERS = sfdpinternal.h spring_electrical.h \
  	sparse_solve.h post_process.h \
  	stress_model.h uniform_stress.h \
- 	QuadTree.h Multilevel.h sfdp.h PriorityQueue.h 
+ 	Multilevel.h sfdp.h PriorityQueue.h 
  
 +pkginclude_HEADERS = sfdp.h spring_electrical.h \
 +	stress_model.h uniform_stress.h \
 +	$(top_srcdir)/lib/sparse/SparseMatrix.h $(top_srcdir)/lib/sparse/general.h
 +	
 +
  if WITH_SFDP
 +lib_LTLIBRARIES = libsfdp.la
  noinst_LTLIBRARIES = libsfdpgen_C.la
  endif
  
  libsfdpgen_C_la_SOURCES = sfdpinit.c spring_electrical.c \
  	sparse_solve.c post_process.c \
  	stress_model.c uniform_stress.c \
 -	Multilevel.c PriorityQueue.c
 +	QuadTree.c Multilevel.c PriorityQueue.c
 +	
 +libsfdp_la_LDFLAGS = -version-info $(SFDP_VERSION) -no-undefined
 +libsfdp_la_SOURCES = $(libsfdpgen_C_la_SOURCES)
 +libsfdp_la_LIBADD = $(libsfdpgen_C_la_LIBADD) \
 +	$(top_builddir)/lib/gvc/libgvc.la \
 +	$(top_builddir)/lib/cgraph/libcgraph.la \
 +	$(top_builddir)/lib/cdt/libcdt.la \
 +	$(top_builddir)/lib/pathplan/libpathplan.la \
 +	$(top_builddir)/lib/neatogen/libneatogen_C.la \
 +	$(top_builddir)/lib/sparse/libsparse_C.la \
 +	$(top_builddir)/lib/rbtree/librbtree_C.la \
 +	$(GTS_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
  
- 
- EXTRA_DIST = Makefile.old sfdp.vcproj
+ EXTRA_DIST = sfdp.vcproj