Removed pparse and pvm from tools, reenabled tools

Makefile.am

@@ -11,7 +11,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 #SUBDIRS = src tools examples
-SUBDIRS = src
+SUBDIRS = src tools
 
 phorwarddir = $(datadir)/phorward
 dist_phorward_DATA = LICENSE README.md CHANGELOG.md doc/phorward.html doc/phorward.css doc/phorward.png doc/prism.css doc/prism.js examples/*.c

Makefile.gnu

@@ -1,32 +1,33 @@
 all:
 	cd src; make -f Makefile.gnu
+	cd tools; make -f Makefile.gnu
 #	cd examples; make -f Makefile.gnu
 #	cd DEMO; make -f Makefile.gnu
 
 clean:
 	cd src; make -f Makefile.gnu clean
-#	cd tools; make -f Makefile.gnu clean
+	cd tools; make -f Makefile.gnu clean
 #	cd examples; make -f Makefile.gnu clean
 #	cd DEMO; make -f Makefile.gnu clean
 
 make_install:
 	cp Makefile.gnu Makefile
 	cp src/Makefile.gnu src/Makefile
-#	cp tools/Makefile.gnu tools/Makefile
+	cp tools/Makefile.gnu tools/Makefile
 #	cp examples/Makefile.gnu examples/Makefile
 #	cp DEMO/Makefile.gnu DEMO/Makefile
 
 make_update:
 	cp Makefile Makefile.gnu
 	cp src/Makefile src/Makefile.gnu
-#	cp tools/Makefile tools/Makefile.gnu
+	cp tools/Makefile tools/Makefile.gnu
 #	cp examples/Makefile examples/Makefile.gnu
 #	cp DEMO/Makefile DEMO/Makefile.gnu
 
 make_uninstall:
 	-rm Makefile
 	-rm src/Makefile
-#	-rm tools/Makefile
+	-rm tools/Makefile
 #	-rm examples/Makefile
 #	-rm DEMO/Makefile
 

Version

@@ -1,4 +1,4 @@
 #!/bin/sh
-echo "0.23.0"
+echo "0.24.0dev"
 
 # When changing version number, remove src/version.h to regenerate it!

src/phorward.h

@@ -99,7 +99,7 @@ typedef char 					pboolean;
 
 
 
-#define LIBPHORWARD_VERSION "0.23.0"
+#define LIBPHORWARD_VERSION "0.24.0dev"
 
 
 

src/version.h

@@ -1 +1 @@
-#define LIBPHORWARD_VERSION "0.23.0"
+#define LIBPHORWARD_VERSION "0.24.0dev"

tools/Makefile.am

@@ -1,19 +1,11 @@
 
-bin_PROGRAMS = 	plex$(EXEEXT) pparse$(EXEEXT) pregex$(EXEEXT) pvm$(EXEEXT)
+bin_PROGRAMS = 	plex$(EXEEXT) pregex$(EXEEXT)
 
 plex_SOURCES = plex.c util.c
 plex_LDADD = ../src/libphorward.la
 plex_CFLAGS = -I$(top_srcdir)/src
 
-pparse_SOURCES = pparse.c util.c
-pparse_LDADD = ../src/libphorward.la
-pparse_CFLAGS = -I$(top_srcdir)/src
-
 pregex_SOURCES = pregex.c util.c
 pregex_LDADD = ../src/libphorward.la
 pregex_CFLAGS = -I$(top_srcdir)/src
 
-pvm_SOURCES = pvm.c util.c
-pvm_LDADD = ../src/libphorward.la
-pvm_CFLAGS = -I$(top_srcdir)/src
-

tools/Makefile.gnu

@@ -2,30 +2,17 @@ CFLAGS += -g -DDEBUG -DUNICODE -DUTF8 -I../src
 LIBPHORWARD = ../src/libphorward.a
 
 PLEX		= ../run/plex
-PPARSE		= ../run/pparse
 PREGEX		= ../run/pregex
-PVM			= ../run/pvm
 
 all: $(PLEX) $(PPARSE) $(PREGEX) $(PVM)
 
 clean:
-	-rm plex.o
-	-rm pparse.o
-	-rm pregex.o
-	-rm ppgram2c.o
-	-rm pvm.o
-	-rm util.o
-	-rm $(PLEX) $(PPARSE) $(PREGEX) $(PPGRAM2C) $(PVM)
+	-rm *.o
+	-rm $(PLEX) $(PREGEX)
 
 $(PLEX): plex.o util.o $(LIBPHORWARD)
 	$(CC) -o $@ $+
 
-$(PPARSE): pparse.o util.o $(LIBPHORWARD)
-	$(CC) -o $@ $+
-
 $(PREGEX): pregex.o util.o $(LIBPHORWARD)
 	$(CC) -o $@ $+
 
-$(PVM): pvm.o util.o $(LIBPHORWARD)
-	$(CC) -o $@ $+
-