summaryrefslogtreecommitdiff
path: root/src/pl
diff options
context:
space:
mode:
authorPeter Eisentraut2000-06-28 18:30:16 +0000
committerPeter Eisentraut2000-06-28 18:30:16 +0000
commit44f64dd3eac840866d884269c8011b22d416bf3c (patch)
treed4be0830d9d93fc2d66fc0281743f2e7a9cd46f5 /src/pl
parent5ac1eac2a6355b090d074489f4f11b5b844c3274 (diff)
Makefile cleanup for interface tree. Now essentially with all the
standard targets and behaviour. Replaced Makefile.in's with Makefile's and declared the respective variables in Makefile.global. maintainer-clean target now available at top level, although it does not work in the backend tree yet. Cleanup pass over Makefile.shlib, renamed some targets and variables. The shared library symlink tests are now done by make, not the shell. ecpg: Remove one warning in sloppy flex output. PL/Perl and Perl interface: the MakeMaker documentation is confusing, the realclean target *does* "delete derived files", but it also uninstalls them. Don't use that. The submake targets in the various bin directories that update libpq should `make all', not `make libpq.a'. That is a) unportable, and b) doesn't build the shared library.
Diffstat (limited to 'src/pl')
-rw-r--r--src/pl/plperl/GNUmakefile5
-rw-r--r--src/pl/plpgsql/src/Makefile10
2 files changed, 9 insertions, 6 deletions
diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index 0e34b2e3d7c..5f7d8ec1206 100644
--- a/src/pl/plperl/GNUmakefile
+++ b/src/pl/plperl/GNUmakefile
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/src/pl/plperl/GNUmakefile,v 1.1 2000/06/27 00:31:49 petere Exp $
+# $Header: /cvsroot/pgsql/src/pl/plperl/GNUmakefile,v 1.2 2000/06/28 18:30:12 petere Exp $
subdir = src/pl/plperl
top_builddir = ../../..
@@ -25,4 +25,5 @@ uninstall:
rm -f $(libdir)/plperl$(DLSUFFIX)
clean distclean maintainer-clean:
- -[ -f Makefile ] && $(MAKE) -f Makefile realclean
+ -[ -f Makefile ] && $(MAKE) -f Makefile clean
+ rm -f Makefile Makefile.old
diff --git a/src/pl/plpgsql/src/Makefile b/src/pl/plpgsql/src/Makefile
index 4abc335ee41..5cf37052f0d 100644
--- a/src/pl/plpgsql/src/Makefile
+++ b/src/pl/plpgsql/src/Makefile
@@ -2,7 +2,7 @@
#
# Makefile for the plpgsql shared object
#
-# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Makefile,v 1.3 2000/06/27 00:32:01 petere Exp $
+# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Makefile,v 1.4 2000/06/28 18:30:16 petere Exp $
#
#-------------------------------------------------------------------------
@@ -19,7 +19,9 @@ CPPFLAGS += -I$(srcdir)
OBJS = pl_parse.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o
-# Shared library stuff, also default `all' target
+all: all-lib
+
+# Shared library stuff
include $(top_srcdir)/src/Makefile.shlib
@@ -68,8 +70,8 @@ mklang.sql: mklang.sql.in
sed -e 's%__libdir__%$(libdir)%g' -e 's%__DLSUFFIX__%$(DLSUFFIX)%g' < $< > $@
-clean distclean: clean-shlib
- rm -f lib$(NAME).a *.o y.tab.c y.tab.h lex.yy.c mklang.sql
+clean distclean: clean-lib
+ rm -f *.o y.tab.c y.tab.h lex.yy.c mklang.sql
maintainer-clean: clean
rm -f $(srcdir)/pl_gram.c $(srcdir)/pl.tab.h $(srcdir)/pl_scan.c