diff options
author | Bruce Momjian <bruce@momjian.us> | 2000-01-20 23:00:40 +0000 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 2000-01-20 23:00:40 +0000 |
commit | 481a7439fb65ed38d6f767994dd743d8858c8a02 (patch) | |
tree | 88f3a27771f0ba453282e1b815aded093044f04c | |
parent | 22e7c0650634037388f1858ae3c97a51f6b3f1ac (diff) | |
download | postgresql-481a7439fb65ed38d6f767994dd743d8858c8a02.tar.gz postgresql-481a7439fb65ed38d6f767994dd743d8858c8a02.zip |
plperl Makefile cleanup. Doesn't work on BSDI yet.
-rw-r--r-- | src/pl/Makefile | 4 | ||||
-rw-r--r-- | src/pl/plperl/Makefile.PL | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/pl/Makefile b/src/pl/Makefile index 467623cf3d5..6263843191b 100644 --- a/src/pl/Makefile +++ b/src/pl/Makefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/pl/Makefile,v 1.2 2000/01/20 22:31:22 momjian Exp $ +# $Header: /cvsroot/pgsql/src/pl/Makefile,v 1.3 2000/01/20 23:00:39 momjian Exp $ # #------------------------------------------------------------------------- @@ -21,7 +21,7 @@ ifeq ($(USE_TCL), true) $(MAKE) -C tcl $@ endif ifeq ($(USE_PERL), true) - if [ "$@" = "install" ]; then \ + -@if [ "$@" = "install" ]; then \ $(MAKE) $(MFLAGS) install-plperl; \ else \ $(MAKE) $(MFLAGS) plperl/Makefile; \ diff --git a/src/pl/plperl/Makefile.PL b/src/pl/plperl/Makefile.PL index 6e1d5699126..e3d9600e723 100644 --- a/src/pl/plperl/Makefile.PL +++ b/src/pl/plperl/Makefile.PL @@ -93,18 +93,20 @@ endif # # Build the shared lib # -plperl : plperl.lo - libtool \$(CC) -o plperl.so plperl.lo \$(SHLIB_EXTRA_LIBS) \$(LDADD) \$(LDFLAGS) +all: plperl -%.lo : %.c - libtool \$(CC) -c \$(CFLAGS) \$< +plperl : plperl.o + \$(CC) -o plperl.so plperl.o \$(SHLIB_EXTRA_LIBS) \$(LDADD) \$(LDFLAGS) + +%.o : %.c + \$(CC) -c \$(CFLAGS) \$< # # Clean # clean: - rm -f \$(INFILES) *.o *.lo + rm -f \$(INFILES) *.o rm -rf .libs rm -f Makefile |