Commitd946604

committed

Fix bogus makefiles ... these didn't build on platforms that are sticky

about being given accurate references to referenced libraries ...

1 parent74b8fe1 commitd946604Copy full SHA for d946604

File tree

+39

-12

lines changed

+39

-12

lines changed

Lines changed: 14 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,20 @@`
`1`	`1`	`#`
`2`		`-# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.10 2000/10/20 21:03:06 petere Exp $`
	`2`	`+# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.11 2000/12/04 01:32:18 tgl Exp $`
`3`	`3`	`#`
`4`	`4`
`5`	`5`	`subdir = contrib/findoidjoins`
`6`	`6`	`top_builddir = ../..`
`7`	`7`	`include$(top_builddir)/src/Makefile.global`
`8`	`8`
`9`	`9`	`overrideCPPFLAGS += -I$(libpgeasy_srcdir) -I$(libpq_srcdir)`
`10`		`-overrideLIBS +=$(libpgeasy)`
	`10`	`+`
	`11`	`+OBJS= findoidjoins.o`
`11`	`12`
`12`	`13`	`all: findoidjoins`
`13`	`14`
	`15`	`+findoidjoins:$(OBJS)$(libpgeasy_builddir)/libpgeasy.a$(libpq_builddir)/libpq.a`
	`16`	`+$(CC)$(CFLAGS)$(LDFLAGS)$(OBJS)$(libpgeasy)$(libpq)$(LIBS) -o$@`
	`17`	`+`
`14`	`18`	`install: all installdirs`
`15`	`19`	`$(INSTALL_PROGRAM) findoidjoins$(X)$(bindir)`
`16`	`20`	`$(INSTALL_SCRIPT) make_oidjoins_check$(bindir)`
`@@ -23,4 +27,11 @@ uninstall:`
`23`	`27`	`rm -f$(bindir)/findoidjoins$(X)$(bindir)/make_oidjoins_check$(docdir)/contrib/README.findoidjoins`
`24`	`28`
`25`	`29`	`cleandistcleanmaintainer-clean:`
`26`		`-rm -f findoidjoins$(X)`
	`30`	`+rm -f findoidjoins$(X)$(OBJS)`
	`31`	`+`
	`32`	`+dependdep:`
	`33`	`+$(CC) -MM -MG$(CFLAGS)*.c> depend`
	`34`	`+`
	`35`	`+ifeq (depend,$(wildcard depend))`
	`36`	`+include depend`
	`37`	`+endif`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,15 @@`
`1`	`1`	`#`
`2`		`-# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.8 2000/11/30 20:36:09 petere Exp $`
	`2`	`+# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.9 2000/12/04 01:32:18 tgl Exp $`
`3`	`3`	`#`
`4`	`4`
`5`	`5`	`subdir = contrib/pg_dumplo`
`6`	`6`	`top_builddir = ../..`
`7`	`7`	`include$(top_builddir)/src/Makefile.global`
`8`	`8`
`9`		`-OBJS= main.o lo_export.o lo_import.o utils.o`
`10`	`9`	`overrideCPPFLAGS += -I$(libpq_srcdir)`
`11`	`10`
	`11`	`+OBJS= main.o lo_export.o lo_import.o utils.o`
	`12`	`+`
`12`	`13`	`all: pg_dumplo`
`13`	`14`
`14`	`15`	`pg_dumplo:$(OBJS)$(libpq_builddir)/libpq.a`
`@@ -25,7 +26,7 @@ uninstall:`
`25`	`26`	`rm -f$(bindir)/pg_dumplo$(X)$(docdir)/contrib/README.pg_dumplo`
`26`	`27`
`27`	`28`	`cleandistcleanmaintainer-clean:`
`28`		`-rm -f pg_dumplo$(OBJS)`
	`29`	`+rm -f pg_dumplo$(X)$(OBJS)`
`29`	`30`
`30`	`31`	`dependdep:`
`31`	`32`	`$(CC) -MM -MG$(CFLAGS)*.c> depend`

Lines changed: 14 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,20 @@`
`1`	`1`	`#`
`2`		`-# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.7 2000/10/20 21:03:26 petere Exp $`
	`2`	`+# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.8 2000/12/04 01:32:19 tgl Exp $`
`3`	`3`	`#`
`4`	`4`
`5`	`5`	`subdir = contrib/pgbench`
`6`	`6`	`top_builddir = ../..`
`7`	`7`	`include$(top_builddir)/src/Makefile.global`
`8`	`8`
`9`	`9`	`overrideCPPFLAGS += -I$(libpq_srcdir)`
`10`		`-overrideLIBS +=$(libpq)`
	`10`	`+`
	`11`	`+OBJS= pgbench.o`
`11`	`12`
`12`	`13`	`all: pgbench`
`13`	`14`
	`15`	`+pgbench:$(OBJS)$(libpq_builddir)/libpq.a`
	`16`	`+$(CC)$(CFLAGS)$(LDFLAGS)$(OBJS)$(libpq)$(LIBS) -o$@`
	`17`	`+`
`14`	`18`	`install: all installdirs`
`15`	`19`	`$(INSTALL_PROGRAM) pgbench$(X)$(bindir)`
`16`	`20`	`$(INSTALL_DATA) README.pgbench$(docdir)/contrib`
`@@ -23,4 +27,11 @@ uninstall:`
`23`	`27`	`rm -f$(bindir)/pgbench$(X)$(docdir)/contrib/README.pgbench$(docdir)/contrib/README.pgbench_jis`
`24`	`28`
`25`	`29`	`cleandistcleanmaintainer-clean:`
`26`		`-rm -f pgbench$(X)`
	`30`	`+rm -f pgbench$(X)$(OBJS)`
	`31`	`+`
	`32`	`+dependdep:`
	`33`	`+$(CC) -MM -MG$(CFLAGS)*.c> depend`
	`34`	`+`
	`35`	`+ifeq (depend,$(wildcard depend))`
	`36`	`+include depend`
	`37`	`+endif`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,20 @@`
`1`	`1`	`#`
`2`		`-# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.8 2000/10/20 21:03:36 petere Exp $`
	`2`	`+# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.9 2000/12/04 01:32:19 tgl Exp $`
`3`	`3`	`#`
`4`	`4`
`5`	`5`	`subdir = contrib/vacuumlo`
`6`	`6`	`top_builddir = ../..`
`7`	`7`	`include$(top_builddir)/src/Makefile.global`
`8`	`8`
`9`	`9`	`overrideCPPFLAGS += -I$(libpq_srcdir)`
`10`		`-overrideLIBS +=$(libpq)`
	`10`	`+`
	`11`	`+OBJS= vacuumlo.o`
`11`	`12`
`12`	`13`	`all: vacuumlo`
`13`	`14`
	`15`	`+vacuumlo:$(OBJS)$(libpq_builddir)/libpq.a`
	`16`	`+$(CC)$(CFLAGS)$(LDFLAGS)$(OBJS)$(libpq)$(LIBS) -o$@`
	`17`	`+`
`14`	`18`	`install: all installdirs`
`15`	`19`	`$(INSTALL_PROGRAM) vacuumlo$(X)$(bindir)`
`16`	`20`	`$(INSTALL_DATA) README.vacuumlo$(docdir)/contrib`
`@@ -22,7 +26,7 @@ uninstall:`
`22`	`26`	`rm -f$(bindir)/vacuumlo$(X)$(docdir)/contrib/README.vacuumlo`
`23`	`27`
`24`	`28`	`cleandistcleanmaintainer-clean:`
`25`		`-rm -f vacuumlo$(X)`
	`29`	`+rm -f vacuumlo$(X)$(OBJS)`
`26`	`30`
`27`	`31`	`dependdep:`
`28`	`32`	`$(CC) -MM -MG$(CFLAGS)*.c> depend`

Comments

(0)