add back various peripheral missing bits of old tree to get "make dist" and "rpmbuild...

diff --git a/Makefile.am b/Makefile.am
index a688715e166bfbf6b0fdfaa9ac010ed064194095..ebe5f7bd31c7a4f3a4ddd0cf2f214bc4c51f2ef2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ html =
 txt_DATA = $(txt)
 html_DATA = $(html)
 
-SUBDIRS = libltdl lib plugin cmd tclpkg doc 
+SUBDIRS = libltdl lib plugin cmd tclpkg doc contrib graphs
 
 doxygen:
        doxygen
@@ -21,9 +21,9 @@ dist-hook:
 
 EXTRA_DIST = $(txt) $(html) graphviz.spec.in graphviz.spec graphviz.cvt \
        autogen.sh config/depcomp config/config.rpath ast_common.h.in \
-       Makefile.old Config.mk configure.old INSTALL.old README.cairo \
+       Makefile.old Config.mk configure.old INSTALL.old \
        Makeargs config.h.old compat_getopt.h iffe \
        m4/README m4/iconv.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 \
-       makearch dot.demo features windows mac
+       makearch features awk
 
 DISTCLEANFILES = ast_common.h FEATURE/* graphviz-@VERSION@*

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index 48903ccad21fb4ddd5fcef8cdaed3f8e677bc0ce..11834b935ad18b91f609b445e0caab3885c44fff 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -75,6 +75,6 @@ dot.pdf: $(top_srcdir)/cmd/dot/dot.1
 dotneato-config.pdf: $(top_srcdir)/cmd/dot/dotneato-config.1
        groff -Tps -man $(top_srcdir)/cmd/dot/dotneato-config.1 | ps2pdf - - >$@
 
-EXTRA_DIST = XFIG_FORMAT3.2.txt Makefile.old dot.1 dotneato-config.1 dot.pdf dotneato-config.pdf dotneato-config.in awk
+EXTRA_DIST = Makefile.old dot.1 dotneato-config.1 dot.pdf dotneato-config.pdf dotneato-config.in
 
 DISTCLEANFILES = dot.pdf dotneato-config.pdf

diff --git a/contrib/prune/Makefile.am b/contrib/prune/Makefile.am
index 95553dec2c29d234a2466a9e4bdc90aa489ec546..2bb6e795aba67ac80ca71efeb328d2c9e132b556 100644 (file)
--- a/contrib/prune/Makefile.am
+++ b/contrib/prune/Makefile.am
@@ -4,9 +4,9 @@ pdfdir = $(pkgdatadir)/doc/pdf
 
 AM_CPPFLAGS = \
         -I$(top_srcdir) \
-        -I$(top_srcdir)/tools/src \
-       -I$(top_srcdir)/agraph \
-       -I$(top_srcdir)/cdt
+        -I$(top_srcdir)/lib/ingraphs \
+       -I$(top_srcdir)/lib/agraph \
+       -I$(top_srcdir)/lib/cdt
 
 bin_PROGRAMS = prune
 noinst_HEADERS = generic_list.h
@@ -15,9 +15,9 @@ pdf_DATA = prune.pdf
 
 prune_SOURCES = generic_list.c prune.c
 
-prune_LDADD = $(top_builddir)/tools/src/libingraphs.la \
-       $(top_builddir)/agraph/libagraph.la \
-       $(top_builddir)/cdt/libcdt.la
+prune_LDADD = $(top_builddir)/lib/ingraphs/libingraphs.la \
+       $(top_builddir)/lib/agraph/libagraph.la \
+       $(top_builddir)/lib/cdt/libcdt.la
 
 .1.pdf:
        groff -Tps -man $< | ps2pdf - - >$@