diff --git a/cmd/tools/gvpack.1 b/cmd/tools/gvpack.1 index a6c788133b272bd223096c6f37ac26853e0ac15e..5b1dab3058d2c70ff15a421953839a3d042fed28 100644 --- a/cmd/tools/gvpack.1 +++ b/cmd/tools/gvpack.1 @@ -128,4 +128,4 @@ subgraphs. .SH AUTHORS Emden R. Gansner .SH "SEE ALSO" -gvpr(1), dot(1), neato(1), twopi(1), ccomps(1), libpack(3) +gvpr(1), dot(1), neato(1), twopi(1), ccomps(1) diff --git a/cmd/tools/gvpack.c b/cmd/tools/gvpack.c index 5e410ec1c7f221075464f26b1e73833186a5f7ac..74badfe523343cbf914a73af6d23904a87a2d907 100644 --- a/cmd/tools/gvpack.c +++ b/cmd/tools/gvpack.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #if defined(_WIN32) __declspec(dllimport) diff --git a/configure.ac b/configure.ac index 214f6bd96d1b057f33d32341883d2e8f67f70d43..32d0904e6212904287d41fb529031c05711837dd 100644 --- a/configure.ac +++ b/configure.ac @@ -2980,7 +2980,6 @@ AC_CONFIG_FILES(Makefile lib/circogen/Makefile lib/twopigen/Makefile lib/patchwork/Makefile - lib/pack/Makefile lib/ortho/Makefile lib/expr/Makefile lib/expr/libexpr.pc diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 1a8bb42ade32273d71521a8f12e5243c65d7e4d7..9d3ac9717d80e444b1ce7ff2e068fc6062adc835 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -13,7 +13,6 @@ add_subdirectory(mingle) add_subdirectory(neatogen) add_subdirectory(ortho) add_subdirectory(osage) -add_subdirectory(pack) add_subdirectory(patchwork) add_subdirectory(pathplan) add_subdirectory(sfio) diff --git a/lib/Makefile.am b/lib/Makefile.am index 46bfca2159a98fa65ce994f3c6052dbaa76ec4a3..b20b68b449d3244ba33575347d2f6a0e1058e8f1 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = cdt cgraph pathplan sfio vmalloc ast \ vpsc rbtree ortho sparse patchwork expr common \ - pack xdot label gvc ingraphs topfish glcomp mingle edgepaint \ + xdot label gvc ingraphs topfish glcomp mingle edgepaint \ circogen dotgen fdpgen neatogen twopigen sfdpgen osage gvpr spine EXTRA_DIST = gvc.vcxproj* diff --git a/lib/circogen/circularinit.c b/lib/circogen/circularinit.c index 5063519ed81c48e3067130ad20c87c6964ef3a93..64a72c686693ad348739326b5a848709a28de823 100644 --- a/lib/circogen/circularinit.c +++ b/lib/circogen/circularinit.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/dotgen/dotinit.c b/lib/dotgen/dotinit.c index 4ca9288902915041c993820b794418679d244b40..28ec58cc9fb89b0fdf386baca6b2826e73db5cd5 100644 --- a/lib/dotgen/dotinit.c +++ b/lib/dotgen/dotinit.c @@ -11,7 +11,7 @@ #include #include -#include +#include #include static void diff --git a/lib/fdpgen/clusteredges.c b/lib/fdpgen/clusteredges.c index 9d0e1c16b2964f9b8a3a8b08b567d5a5807a84ac..d00e97182536e574e04f7ea1946fdab5680e31e1 100644 --- a/lib/fdpgen/clusteredges.c +++ b/lib/fdpgen/clusteredges.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include typedef struct { int cnt; diff --git a/lib/fdpgen/comp.c b/lib/fdpgen/comp.c index a192d61f920f4d8349fb6a4b39a5557f5250dba9..15ced46662b41be806eaba4c106306e9d34c3a84 100644 --- a/lib/fdpgen/comp.c +++ b/lib/fdpgen/comp.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include #define MARK(n) (marks[ND_id(n)]) diff --git a/lib/fdpgen/layout.c b/lib/fdpgen/layout.c index 19a449cde31ae8263481f63e4673b820b1d87a9e..e15f1924780715cde14dbaebca4033b7883d11f0 100644 --- a/lib/fdpgen/layout.c +++ b/lib/fdpgen/layout.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lib/gvc.vcxproj b/lib/gvc.vcxproj index 708d8b4b0043de4acd2a2d84956cc9d26ad809cd..034f59014db8e35908e765f2c13104db6d6760e3 100644 --- a/lib/gvc.vcxproj +++ b/lib/gvc.vcxproj @@ -150,7 +150,7 @@ awk -f $(SolutionDir)awk\colortbl.awk color_lib > common\colortbl.h - + @@ -197,8 +197,8 @@ awk -f $(SolutionDir)awk\colortbl.awk color_lib > common\colortbl.h - - + + @@ -225,4 +225,4 @@ awk -f $(SolutionDir)awk\colortbl.awk color_lib > common\colortbl.h - \ No newline at end of file + diff --git a/lib/gvc.vcxproj.filters b/lib/gvc.vcxproj.filters index 36bfe21a4e9736fdd01c2e93ea925ce37bbb1287..c6e89e22e00ef1289873159012efe84d479dca59 100644 --- a/lib/gvc.vcxproj.filters +++ b/lib/gvc.vcxproj.filters @@ -63,7 +63,7 @@ Header Files - + Header Files @@ -134,7 +134,7 @@ Source Files - + Source Files @@ -227,7 +227,7 @@ Source Files - + Source Files diff --git a/lib/gvc/CMakeLists.txt b/lib/gvc/CMakeLists.txt index da70b122cbbbdd542dba7af34f1c6c5b03cda494..fa901b28a267fb26a41602b65c62197b4cc86365 100644 --- a/lib/gvc/CMakeLists.txt +++ b/lib/gvc/CMakeLists.txt @@ -16,6 +16,7 @@ add_library(gvc SHARED gvplugin_loadimage.h gvplugin_render.h gvplugin_textlayout.h + pack.h # Source files gvc.c @@ -31,6 +32,8 @@ add_library(gvc SHARED gvtextlayout.c gvtool_tred.c gvusershape.c + ccomps.c + pack.c # Link definition file for Windows gvc.def @@ -40,6 +43,7 @@ target_include_directories(gvc PRIVATE ${GRAPHVIZ_LIB_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${TOP_SOURCE_DIR} + ${GRAPHVIZ_LIB_DIR} ${GRAPHVIZ_LIB_DIR}/ast ${GRAPHVIZ_LIB_DIR}/cdt ${GRAPHVIZ_LIB_DIR}/cgraph @@ -50,14 +54,12 @@ target_include_directories(gvc PRIVATE target_link_libraries(gvc PRIVATE $ - $ ) target_link_libraries(gvc PUBLIC cdt cgraph label - pack pathplan xdot ${EXPAT_LIBRARIES} diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am index 56ea4a72df2e641f5a0305159499c10cad633a32..3c6c2602b17537d41b69c85843418d617d4ff76b 100644 --- a/lib/gvc/Makefile.am +++ b/lib/gvc/Makefile.am @@ -22,14 +22,16 @@ LIBS = $(SOCKET_LIBS) $(Z_LIBS) $(MATH_LIBS) pkginclude_HEADERS = gvc.h gvcext.h gvplugin.h gvcjob.h \ gvcommon.h gvplugin_render.h gvplugin_layout.h gvconfig.h \ - gvplugin_textlayout.h gvplugin_device.h gvplugin_loadimage.h + gvplugin_textlayout.h gvplugin_device.h gvplugin_loadimage.h \ + pack.h + noinst_HEADERS = gvcint.h gvcproc.h gvio.h noinst_LTLIBRARIES = libgvc_C.la lib_LTLIBRARIES = libgvc.la pkgconfig_DATA = libgvc.pc -man_MANS = gvc.3 +man_MANS = gvc.3 pack.3 if ENABLE_MAN_PDFS -pdf_DATA = gvc.3.pdf +pdf_DATA = gvc.3.pdf pack.3.pdf endif if ENABLE_MAN_PDFS @@ -44,15 +46,14 @@ endif libgvc_C_la_SOURCES = gvrender.c gvlayout.c gvdevice.c gvloadimage.c \ gvcontext.c gvjobs.c gvevent.c gvplugin.c gvconfig.c \ - gvtool_tred.c gvtextlayout.c gvusershape.c gvc.c + gvtool_tred.c gvtextlayout.c gvusershape.c gvc.c \ + ccomp.c pack.c libgvc_C_la_LIBADD = \ - $(top_builddir)/lib/pack/libpack_C.la \ $(top_builddir)/lib/xdot/libxdot_C.la \ $(top_builddir)/lib/label/liblabel_C.la \ $(top_builddir)/lib/common/libcommon_C.la libgvc_C_la_DEPENDENCIES = \ - $(top_builddir)/lib/pack/libpack_C.la \ $(top_builddir)/lib/xdot/libxdot_C.la \ $(top_builddir)/lib/label/liblabel_C.la \ $(top_builddir)/lib/common/libcommon_C.la @@ -84,10 +85,16 @@ gvc.3.pdf: gvc.3.ps @PS2PDF@ $< gvc.3.ps: $(srcdir)/gvc.3 - @GROFF@ -Tps -man $< >$@ + @GROFF@ -Tps -man $< > $@ + +pack.3.pdf: pack.3.ps + @PS2PDF@ $< + +pack.3.ps: $(srcdir)/pack.3 + @GROFF@ -Tps -man $< > $@ endif endif -EXTRA_DIST = $(man_MANS) $(pdf) gvc.def +EXTRA_DIST = $(man_MANS) $(pdf) gvc.def ptest.c -DISTCLEANFILES = $(pdf) gvc.3.ps +DISTCLEANFILES = $(pdf) gvc.3.ps pack.3.ps diff --git a/lib/pack/ccomps.c b/lib/gvc/ccomps.c similarity index 99% rename from lib/pack/ccomps.c rename to lib/gvc/ccomps.c index 2212f32d16cd45028f21a9e66fde1066184c2a4c..71468fdc229edcba4983b53e4fbc4244dc0de34e 100644 --- a/lib/pack/ccomps.c +++ b/lib/gvc/ccomps.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #define MARKED(stk,n) ((stk)->markfn(n,-1)) #define MARK(stk,n) ((stk)->markfn(n,1)) diff --git a/lib/pack/pack.3 b/lib/gvc/pack.3 similarity index 100% rename from lib/pack/pack.3 rename to lib/gvc/pack.3 diff --git a/lib/pack/pack.c b/lib/gvc/pack.c similarity index 99% rename from lib/pack/pack.c rename to lib/gvc/pack.c index 319d96addee7a0ad09388fb0f3bb848d8a54f121..1d9d8bcc8a2d53338ba37df048031bdfe4f2a1ad 100644 --- a/lib/pack/pack.c +++ b/lib/gvc/pack.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include diff --git a/lib/pack/pack.h b/lib/gvc/pack.h similarity index 100% rename from lib/pack/pack.h rename to lib/gvc/pack.h diff --git a/lib/pack/ptest.c b/lib/gvc/ptest.c similarity index 99% rename from lib/pack/ptest.c rename to lib/gvc/ptest.c index 98c2a8e7a03a41f0a764422b41e1c3c6f5aba87f..a7586b7f8e9ba08e083d5703c7995ed8396ccf4e 100644 --- a/lib/pack/ptest.c +++ b/lib/gvc/ptest.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include /* Test driver for libpack library. * Input consists of graphs in dot format. diff --git a/lib/neatogen/neatoinit.c b/lib/neatogen/neatoinit.c index 975dd9ef53f08c5664f67082d0eb41798273e82b..6da88de19a4f82c1248c8262d285dbefda39a75d 100644 --- a/lib/neatogen/neatoinit.c +++ b/lib/neatogen/neatoinit.c @@ -18,7 +18,7 @@ #include #include -#include +#include #include #ifdef DIGCOLA #include diff --git a/lib/osage/osageinit.c b/lib/osage/osageinit.c index cadca6499f33b1b56733c8fab1371b9ea603f3b1..205699b7b04ba123d3e3d980ebc43349618e4004 100644 --- a/lib/osage/osageinit.c +++ b/lib/osage/osageinit.c @@ -16,7 +16,7 @@ #include #include -#include +#include #define CL_CHUNK 10 #define DFLT_SZ 18 diff --git a/lib/pack/CMakeLists.txt b/lib/pack/CMakeLists.txt index 73f99d0a7e6452f239ed04c107905544b793956f..c582b705bc120c37682f6dddad70452380643f48 100644 --- a/lib/pack/CMakeLists.txt +++ b/lib/pack/CMakeLists.txt @@ -1,26 +1,10 @@ -add_definitions(-DGVC_EXPORTS) - -add_library(pack_obj OBJECT +target_sources(gvc PRIVATE # Header files - pack.h + ${CMAKE_CURRENT_SOURCE_DIR}/pack.h # Source files - ccomps.c - pack.c -) - -target_include_directories(pack_obj PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pathplan -) - -add_library(pack STATIC - $ + ${CMAKE_CURRENT_SOURCE_DIR}/ccomps.c + ${CMAKE_CURRENT_SOURCE_DIR}/pack.c ) # Specify headers to be installed diff --git a/lib/pack/Makefile.am b/lib/pack/Makefile.am deleted file mode 100644 index 84eb378492215c02242132d7d177a11f37840b5f..0000000000000000000000000000000000000000 --- a/lib/pack/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -## Process this file with automake to produce Makefile.in - -pdfdir = $(pkgdatadir)/doc/pdf -#pkgconfigdir = $(libdir)/pkgconfig - -AM_CPPFLAGS = \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/common \ - -I$(top_srcdir)/lib/gvc \ - -I$(top_srcdir)/lib/pathplan \ - -I$(top_srcdir)/lib/cgraph \ - -I$(top_srcdir)/lib/cdt - -if WITH_WIN32 -AM_CFLAGS = -D_BLD_gvc=1 -endif - -pkginclude_HEADERS = pack.h -noinst_LTLIBRARIES = libpack_C.la -man_MANS = pack.3 -if ENABLE_MAN_PDFS -pdf_DATA = pack.3.pdf - -if HAVE_PS2PDF -pdf = $(pdf_DATA) -else -pdf = ERROR_NO_PS2PDF -endif -else -pdf = -endif - -libpack_C_la_SOURCES = ccomps.c pack.c - -if ENABLE_MAN_PDFS -if HAVE_PS2PDF -pack.3.pdf: pack.3.ps - @PS2PDF@ $< - -pack.3.ps: $(srcdir)/pack.3 - @GROFF@ -Tps -man $< >$@ -endif -endif - -EXTRA_DIST = $(man_MANS) $(pdf) ptest.c - -DISTCLEANFILES = $(pdf) pack.3.ps - diff --git a/lib/pack/libpack.pc.in b/lib/pack/libpack.pc.in deleted file mode 100644 index e4bc754e037c41c1f4496ba42e715f700fb29378..0000000000000000000000000000000000000000 --- a/lib/pack/libpack.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/@PACKAGE@ - -Name: libpack -Description: Graph packer -Version: @VERSION@ -Libs: -L${libdir} -lpack -Cflags: -I${includedir} diff --git a/lib/patchwork/patchworkinit.c b/lib/patchwork/patchworkinit.c index b01d201739b4247709c6ba6b1db15414c57e0b77..e9349209448567bda455cc964d15f878aec72268 100644 --- a/lib/patchwork/patchworkinit.c +++ b/lib/patchwork/patchworkinit.c @@ -10,7 +10,7 @@ #include #include -#include +#include #include /* the following code shamelessly copied from lib/fdpgen/layout.c diff --git a/lib/sfdpgen/sfdpinit.c b/lib/sfdpgen/sfdpinit.c index ac7d9026dc7e7fab804995fdcbb04724dd4ffa4e..44453189dd930f3578e9922940da2f135d56c58f 100644 --- a/lib/sfdpgen/sfdpinit.c +++ b/lib/sfdpgen/sfdpinit.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lib/twopigen/twopiinit.c b/lib/twopigen/twopiinit.c index ef823dbc5de445747e57a5fd42d566242c757445..549767e946941636b2df901d9b0635d3b270217c 100644 --- a/lib/twopigen/twopiinit.c +++ b/lib/twopigen/twopiinit.c @@ -16,7 +16,7 @@ #include #include -#include +#include #include static void twopi_init_edge(edge_t * e) diff --git a/windows/build.bat b/windows/build.bat index 7b0ae74b4aa5970044e2188722a163310dd6ae13..274b7c756c72a2ecf7498c91579e40bbba0feda6 100755 --- a/windows/build.bat +++ b/windows/build.bat @@ -73,7 +73,7 @@ copy /Y %buildDir%lib\gvc\gvplugin_textlayout.h %buildBaseDir%release\include\gr copy /Y %buildDir%lib\gvc\gvplugin_device.h %buildBaseDir%release\include\graphviz copy /Y %buildDir%lib\gvc\gvplugin_layout.h %buildBaseDir%release\include\graphviz copy /Y %buildDir%lib\gvc\gvplugin_loadimage.h %buildBaseDir%release\include\graphviz -copy /Y %buildDir%lib\pack\pack.h %buildBaseDir%release\include\graphviz +copy /Y %buildDir%lib\gvc\pack.h %buildBaseDir%release\include\graphviz copy /Y %buildDir%lib\xdot\xdot.h %buildBaseDir%release\include\graphviz copy /Y %buildDir%lib\gvpr\gvpr.h %buildBaseDir%release\include\graphviz diff --git a/windows/install.bat b/windows/install.bat index 9521d61deb0ab363e43e086f54ebacf1e3b2c33e..1228b1bd25349e577b7bb1d40b428644be84059d 100755 --- a/windows/install.bat +++ b/windows/install.bat @@ -62,7 +62,6 @@ copy gd.lib %root%\lib copy graph.lib %root%\lib copy gvc.lib %root%\lib copy neatogen.lib %root%\lib -copy pack.lib %root%\lib copy pathplan.lib %root%\lib copy twopigen.lib %root%\lib cd ..\..\.. @@ -97,7 +96,7 @@ copy lib\gvc\gvplugin_loadimage.h %root%\include copy lib\gvc\gvplugin_render.h %root%\include copy lib\gvc\gvplugin_textlayout.h %root%\include copy lib\ingraphs\ingraphs.h %root%\include -copy lib\pack\pack.h %root%\include +copy lib\gvc\pack.h %root%\include copy lib\pathplan\pathgeom.h %root%\include copy lib\common\textpara.h %root%\include copy lib\common\types.h %root%\include