some renaming

diff --git a/lib/inkpot/.cvsignore b/lib/inkpot/.cvsignore
index 3182bc03d73605102272086b827fa262cbe960e3..81e5ac6b190acad07438839893c56000621a382c 100644 (file)
--- a/lib/inkpot/.cvsignore
+++ b/lib/inkpot/.cvsignore
@@ -8,7 +8,7 @@ Makefile.in
 *.pdf
 CMakeFiles CMakeTmp CMakeFiles CMakeCache.txt cmake_install.cmake
 inkpot
-inkpot_define.h
-inkpot_scheme_table.h
-inkpot_value_table.h
+inkpot_lib_define.h
+inkpot_lib_scheme.h
+inkpot_lib_value.h
 *.dat

diff --git a/lib/inkpot/Makefile.am b/lib/inkpot/Makefile.am
index ce1667e882d5ba408067d6634997707fb6ed4170..3d1c57fcd5f0fc8c3ccb4be497a16dc4a5481405 100644 (file)
--- a/lib/inkpot/Makefile.am
+++ b/lib/inkpot/Makefile.am
@@ -4,17 +4,17 @@
 pdfdir = $(pkgdatadir)/doc/pdf
 pkgconfigdir = $(libdir)/pkgconfig
 
-#pkginclude_HEADERS = inkpot.h
-#lib_LTLIBRARIES = libinkpot.la
-#pkgconfig_DATA = libinkpot.pc
-#bin_PROGRAMS = inkpot
+pkginclude_HEADERS = inkpot.h
+lib_LTLIBRARIES = libinkpot.la
+pkgconfig_DATA = libinkpot.pc
+bin_PROGRAMS = inkpot
 
-#noinst_HEADERS = inkpot_scheme.h inkpot_xlate.h inkpot_value.h \
-#      inkpot_define.h inkpot_value_table.h inkpot_scheme_table.h
-#noinst_LTLIBRARIES = libinkpot_C.la
+noinst_HEADERS = inkpot_scheme.h inkpot_xlate.h inkpot_value.h \
+       inkpot_lib_define.h inkpot_lib_value.h inkpot_lib_scheme.h
+noinst_LTLIBRARIES = libinkpot_C.la
 
-#man_MANS = inkpot.3 inkpot.1
-#pdf_DATA = inkpot.3.pdf inkpot.1.pdf
+man_MANS = inkpot.3 inkpot.1
+pdf_DATA = inkpot.3.pdf inkpot.1.pdf
 
 inkpot_SOURCES = inkpot.c
 inkpot_LDADD = $(builddir)/libinkpot.la
@@ -26,11 +26,11 @@ libinkpot_la_SOURCES = $(libinkpot_C_la_SOURCES)
 libinkpot_la_LIBADD = $(libinkpot_C_la_LIBADD)
 libinkpot_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined
 
-inkpot_value_table.h: $(builddir)/inkpot_define.h
+inkpot_lib_value.h: $(builddir)/inkpot_lib_define.h
 
-inkpot_scheme_table.h: $(builddir)/inkpot_define.h
+inkpot_lib_scheme.h: $(builddir)/inkpot_lib_define.h
 
-inkpot_define.h: inkpot_lib.tcl inkpot_lib_procs.tcl \
+inkpot_lib_define.h: inkpot_lib.tcl inkpot_lib_procs.tcl \
                        $(builddir)/inkpot_lib_tk.dat \
                                $(builddir)/inkpot_lib_svg.dat \
                        $(builddir)/inkpot_lib_x11.dat \
@@ -62,7 +62,7 @@ inkpot.3.pdf: inkpot.3
 CLEANFILES = inkpot_lib_*.dat
 
 EXTRA_DIST = $(man_MANS) $(pdf_DATA) Makefile.old *.tcl data/* \
-       inkpot_define.h inkpot_value_table.h inkpot_scheme_table.h
+       inkpot_lib_define.h inkpot_lib_value.h inkpot_lib_scheme.h
 
 DISTCLEANFILES = $(pdf_DATA) \
-       inkpot_define.h inkpot_value_table.h inkpot_scheme_table.h
+       inkpot_lib_define.h inkpot_lib_value.h inkpot_lib_scheme.h