From 9eca2885c73e32b81b2ebe34e65fbdedc313c930 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Sun, 7 Apr 2002 08:48:54 +0000
Subject: [PATCH] r1759: *** empty log message ***

---
 Makefile                       | 20 +++++++++-----------
 interfaces/clsql-uffi/Makefile | 11 ++++++-----
 interfaces/mysql/Makefile      | 18 ++++++++++--------
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/Makefile b/Makefile
index 684ecc8..ec5d9f1 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.10 2002/04/07 08:09:11 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.11 2002/04/07 08:48:54 kevin Exp $
 #
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -15,7 +15,7 @@
 
 PKG=clsql
 
-.PHONY: all libs clean realclean doc tagcvs dist
+.PHONY: all libs clean distclean dist-doc tagcvs dist
 
 SUBDIRS=interfaces/mysql interfaces/clsql-uffi
 .PHONY: subdirs $(SUBDIRS)
@@ -28,16 +28,14 @@ $(SUBDIRS):
 clean:
 	@rm -f $(PKG)-*.tar.gz $(PKG)-*.zip
 	@find . -type d -name .bin |xargs rm -rf 
-	$(MAKE) -C doc clean
-	for i in $(SUBDIRS) ; do \
-		$(MAKE) -C $$i clean; \
-	done
-
-realclean: clean
 	@find . -type f -name "#*" -or -name \*~ -exec rm {} \;
+	$(MAKE) -C doc $@
+	@for i in $(SUBDIRS) ; do $(MAKE) -C $$i $@ ; done
+
+distclean: clean
 
-doc:
-	$(MAKE) -C doc dist-doc
+dist-doc:
+	$(MAKE) -C doc $@
 
 VERSION=$(shell cat VERSION)
 DISTDIR=$(PKG)-$(VERSION)
@@ -56,7 +54,7 @@ tagcvs:
 	cvs -q rtag -d $(TAG) $(PKG)
 	cvs -q tag -F $(TAG)
 
-dist: realclean docs tagcvs
+dist: distclean dist-doc tagcvs
 	@rm -fr $(DISTDIR) $(DIST_TARBALL) $(DIST_ZIP)
 	@mkdir $(DISTDIR)
 	@cp -a $(SOURCE_FILES) $(DISTDIR)
diff --git a/interfaces/clsql-uffi/Makefile b/interfaces/clsql-uffi/Makefile
index dae44e9..14dfaa1 100644
--- a/interfaces/clsql-uffi/Makefile
+++ b/interfaces/clsql-uffi/Makefile
@@ -7,7 +7,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.5 2002/04/03 17:58:22 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.6 2002/04/07 08:48:54 kevin Exp $
 #
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -36,16 +36,17 @@ source=$(base).c
 object=$(base).o
 shared_lib=$(base).so
 
+.PHONY: all clean distclean
+
 all: $(shared_lib)
 
 $(shared_lib): $(source) Makefile
 	$(CC) ${SHARED_CC_OPT} -c $(source) -o $(object)
 	$(LD) ${SHARED_LD_OPT} $(object) -o $(shared_lib)
-	rm $(object)
+	@rm $(object)
 
 clean:
-	rm -f $(object) $(shared_lib)
+	@rm -f $(object) $(shared_lib) *~
 
-realclean: clean
-	rm -f *~
+distclean: clean
 
diff --git a/interfaces/mysql/Makefile b/interfaces/mysql/Makefile
index 17099e5..3f18ee0 100644
--- a/interfaces/mysql/Makefile
+++ b/interfaces/mysql/Makefile
@@ -7,7 +7,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.6 2002/04/03 17:58:23 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.7 2002/04/07 08:48:54 kevin Exp $
 #
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -29,10 +29,11 @@ LD=gcc
 #LD=ld
 
 # Set to the directory where you have installed mysql's library
-MYSQL_DIR=/opt/mysql
-#MYSQL_DIR=/usr
+#MYSQL_DIR=/opt/mysql
+#MYSQL_LIB=$(MYSQL_DIR)/lib/mysql
+MYSQL_DIR=/usr
+MYSQL_LIB=$(MYSQL_DIR)/lib
 
-MYSQL_LIB=$(MYSQL_DIR)/lib/mysql
 MYSQL_LIB_FILE=$(MYSQL_LIB)/libmysqlclient.so
 MYSQL_INCLUDE=$(MYSQL_DIR)/include/mysql
 
@@ -44,16 +45,17 @@ source=$(base).c
 object=$(base).o
 shared_lib=$(base).so
 
+.PHONY: all clean distclean
+
 all: $(shared_lib)
 
 $(shared_lib): $(source) Makefile $(MYSQL_LIB_FILE)
 	$(CC) ${SHARED_CC_OPT} -I $(MYSQL_INCLUDE) -c $(source) -o $(object)
 	$(LD) ${SHARED_LD_OPT} $(object) $(MYSQL_LIB_FILE) -o $(shared_lib)
-	rm $(object)
+	@rm $(object)
 
 clean:
-	rm -f $(object) $(shared_lib)
+	@rm -f $(object) $(shared_lib) *~
 
-realclean: clean
-	rm -f *~
+distclean: clean
 
-- 
2.34.1