plperl Makefile cleanup. Doesn't work on BSDI yet.

diff --git a/src/pl/Makefile b/src/pl/Makefile
index 467623cf3d5fbd0fd4a539f38354ebb45cb05a77..6263843191be60c6650d714800bc84a55eb423a5 100644 (file)
--- 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 6e1d56991264c300e3d1b6f3cfe21b48c60b4d10..e3d9600e7236f64b8c90442f299f43970e73f4a9 100644 (file)
--- 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