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

bmomjian · bmomjian · commit 481a7439fb65 · 2000-01-20T23:00:40.000Z
diff --git 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
@@ -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
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/pl/Makefile,v 1.2 2000/01/20 22:31:22 momjian Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/pl/Makefile,v 1.3 2000/01/20 23:00:39 momjian Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`@@ -21,7 +21,7 @@ ifeq ($(USE_TCL), true)`
`21`	`21`	`$(MAKE) -C tcl $@`
`22`	`22`	`endif`
`23`	`23`	`ifeq ($(USE_PERL), true)`
`24`		`- if [ "$@" = "install" ]; then \`
	`24`	`+ -@if [ "$@" = "install" ]; then \`
`25`	`25`	`$(MAKE) $(MFLAGS) install-plperl; \`
`26`	`26`	`else \`
`27`	`27`	`$(MAKE) $(MFLAGS) plperl/Makefile; \`
Original file line number	Diff line number	Diff line change
`@@ -93,18 +93,20 @@ endif`
`93`	`93`	`#`
`94`	`94`	`# Build the shared lib`
`95`	`95`	`#`
`96`		`-plperl : plperl.lo`
`97`		`- libtool \$(CC) -o plperl.so plperl.lo \$(SHLIB_EXTRA_LIBS) \$(LDADD) \$(LDFLAGS)`
	`96`	`+all: plperl`
`98`	`97`
`99`		`-%.lo : %.c`
`100`		`- libtool \$(CC) -c \$(CFLAGS) \$<`
	`98`	`+plperl : plperl.o`
	`99`	`+ \$(CC) -o plperl.so plperl.o \$(SHLIB_EXTRA_LIBS) \$(LDADD) \$(LDFLAGS)`
	`100`	`+`
	`101`	`+%.o : %.c`
	`102`	`+ \$(CC) -c \$(CFLAGS) \$<`
`101`	`103`
`102`	`104`
`103`	`105`	`#`
`104`	`106`	`# Clean`
`105`	`107`	`#`
`106`	`108`	`clean:`
`107`		`- rm -f \$(INFILES) .o .lo`
	`109`	`+ rm -f \$(INFILES) *.o`
`108`	`110`	`rm -rf .libs`
`109`	`111`	`rm -f Makefile`
`110`	`112`