From 3a356e2ebe4544cfdb542b4d9d6155d5d6bc42cf Mon Sep 17 00:00:00 2001
From: ygrek <ygrek@autistici.org>
Date: Tue, 21 Oct 2008 14:15:40 +0300
Subject: [PATCH] cleanup

---
 Configure | 13 -------------
 Makefile  | 44 +++++++++++++-------------------------------
 2 files changed, 13 insertions(+), 44 deletions(-)

diff --git a/Configure b/Configure
index 52b6169..4597721 100755
--- a/Configure
+++ b/Configure
@@ -2,11 +2,9 @@
 
 export PATH 
 PATH="/bin:/usr/bin:/usr/local/bin"
-modules="lib-src prop-src tests"
 
 CC=$1
 
-iostream_lib=""
 if [ "none$CC" = "none" ]; then
    echo "No compiler specified, assuming g++";
    CC="g++";
@@ -16,7 +14,6 @@ case `uname -s` in
    HP-UX) ARCH=hpux 
           ;;
    Linux) ARCH=linux 
-	  iostream_lib="s/\\\$(gcc-iostream-lib)/-liostream/"
           ;;
    SunOS)
       case `uname -r` in
@@ -102,14 +99,4 @@ fi
 echo "#endif" >>include/AD/config/config.h
 echo "include/AD/config/config.h created"
 
-
-#replace="$iostream_lib"
-#echo "$replace"
-
 echo "Using the $ARCH configuration"
-#for module in $modules ;
-#do
-#   module_name=`echo $module | sed -e 's/\//:/g'`
-#   echo "sed -e $replace < configure-dir/Makefile.$module_name > $module/Makefile"
-#   sed -e "$replace" < configure-dir/Makefile.$module_name > $module/Makefile
-#done
diff --git a/Makefile b/Makefile
index a78747d..4b9f3aa 100644
--- a/Makefile
+++ b/Makefile
@@ -6,47 +6,29 @@
 
 VERSION	= 2.3.0
 
-RM	= rm -f	
+RM	= rm -f
 LIBRARY	= libprop.a
 CC	= g++-3.3
 COPTS   	= -O6 -pedantic -frepo -g
 PROP_COPTS	= $(COPTS)
 #LIBRARY_COPTS   = -O6 -pedantic -Wall -fexternal-templates
 LIBRARY_COPTS   = -O6 -pedantic -Wall -g
-LDOPTS  = #-lg++ 
+LDOPTS  = #-lg++
 OBJ = obj
 
 TARGET_BIN_DIR = /usr/local/bin
 TARGET_LIB_DIR = /usr/local/lib
 TARGET_INCLUDE_DIR = /usr/local/include
 
-#
-#  You may have to add this for g++ 2.6.x
-#
-#COPTS   = -g -O6 -fno-implicit-templates
-
-##############################################################################
-#   Files in the ADLib package:
-##############################################################################
-MiscFiles= INSTALL README NOTICE COPYRIGHT \
-	   Makefile lib-src/Makefile 
-Areas	= algebra automata contain csp dynparser gc generic \
-	  generic hash memory numeric object objc \
-	  prop rete rewrite persist prettypr \
-	  sort strings symbolic trees tries \
-	  scheduling absinterp machine dataflow parser-tools \
-	  backend_tools	
-TarFile= prop-$(VERSION).tar.gz
-
 #############################################################################
 #
 #   Build the ADLib library and the tools
 #
 #############################################################################
 build:
-	cd lib-src; make CC="$(CC)" COPTS="$(LIBRARY_COPTS)" LDOPTS="$(LDOPTS)" OBJ="$(OBJ)"
-	cd prop-src; make CC="$(CC)" COPTS="$(PROP_COPTS)" LDOPTS="$(LDOPTS)" OBJ="$(OBJ)"
-	cd docs; make
+	make -C lib-src
+	make -C prop-src
+	make -C docs
 	@echo Done
 
 config:
@@ -61,7 +43,7 @@ test:
 	cd prop-src; make test CC="$(CC)" COPTS="$(COPTS)" LDOPTS="$(LDOPTS)" OBJ="$(OBJ)"
 	@echo Testing of the prop translator ran ok.
 
-testall:	
+testall:
 	cd tests; make test CC="$(CC)" COPTS="$(COPTS)" LDOPTS="$(LDOPTS)" OBJ="$(OBJ)"
 	@echo All test programs ran ok.
 
@@ -70,17 +52,17 @@ demo:
 	@echo All demo programs have been compiled.
 
 #############################################################################
-#  
+#
 #  Line count
-# 
+#
 #############################################################################
-wc:	
+wc:
 	wc include/AD/*/*.h lib-src/*/*.cc \
 	prop-src/[a-z]*.ph \
 	prop-src/[a-z]*.pcc
 
 #############################################################################
-#  
+#
 #  Clean up: remove all *.o files and .cc and .h files generated using
 #            Prop.  But don't remove the executable and the library.
 #
@@ -94,7 +76,7 @@ spotless:
 	cd tools/pretty; make spotless
 	#cd docs; make spotless
 
-cleanhouse:	
+cleanhouse:
 	cd lib-src; make spotless
 	cd prop-src; make clean
 	cd tools/test; make spotless
@@ -108,12 +90,12 @@ cleanhouse:
 #  Make tar.gz files for Unix distribution.
 #############################################################################
 dist:	tar
-tar:	
+tar:
 	bin/Distribute NO_DISTRIBUTE
 full-dist:
 	bin/Distribute NO_DISTRIBUTE2
 
-first-install: 
+first-install:
 	cp prop-src/prop $(TARGET_BIN_DIR)
 	chmod 755 $(TARGET_BIN_DIR)/prop
 	cp tools/scripts/* $(TARGET_BIN_DIR)
-- 
2.11.4.GIT