Commitf3a58f2

committed

Makefile cleanup.

1 parentdf7a435 commitf3a58f2Copy full SHA for f3a58f2

File tree

+21

-20

lines changed

+21

-20

lines changed

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,19 +7,20 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.1 1997/08/1620:56:28 scrappy Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.2 1997/09/1618:47:16 momjian Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`14`		`-#include ../Makefile.global`
	`14`	`+SRCDIR= ..`
	`15`	`+include$(SRCDIR)/Makefile.global`
`15`	`16`
`16`	`17`	`.DEFAULTall:`
`17`	`18`	`$(MAKE) -C libpq$@`
`18`		`-`
`19`	`19`	`ifeq ($(HAVE_Cplusplus), true)`
`20`	`20`	`$(MAKE) -C libpq++ $@`
	`21`	`+else`
	`22`	`+echo $(HAVE_Cplusplus): No C++`
`21`	`23`	`endif`
`22`		`-`
`23`	`24`	`ifeq ($(USE_TCL), true)`
`24`	`25`	`$(MAKE) -C libpgtcl $@`
`25`	`26`	`endif`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,16 +7,16 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.13 1997/09/14 23:34:13 momjian Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.14 1997/09/16 18:47:19 momjian Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`14`	`14`	`SRCDIR= ../..`
`15`		`-include ../../Makefile.global`
	`15`	`+:nclude$(SRCDIR)/Makefile.global`
`16`	`16`
`17`	`17`	`INCLUDE_OPT=\`
`18`		`- -I../../backend\`
`19`		`- -I../../include\`
	`18`	`+ -I$(SRCDIR)/backend\`
	`19`	`+ -I$(SRCDIR)/include\`
`20`	`20`	`-I$(LIBPQDIR)\`
`21`	`21`	`-I$(TCL_INCDIR)`
`22`	`22`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,13 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.8 1997/04/04 10:42:43 scrappy Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.9 1997/09/16 18:47:23 momjian Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`14`		`-SRCDIR= ..`
`15`		`-include../Makefile.global`
`16`		`-SRCHEADERDIR =../include`
	`14`	`+SRCDIR= ../..`
	`15`	`+include$(SRCDIR)/Makefile.global`
	`16`	`+SRCHEADERDIR =$(SRCDIR)/include`
`17`	`17`	`LIBPQHEADERDIR =$(SRCHEADERDIR)/libpq`
`18`	`18`
`19`	`19`	`LIBNAME= libpq++`
`@@ -25,7 +25,7 @@ LIBNAME= libpq++`
`25`	`25`	`CXXFLAGS=$(CFLAGS) -Wno-error`
`26`	`26`
`27`	`27`	`INCLUDE_OPT=\`
`28`		`- -I../backend\`
	`28`	`+ -I$(SRCDIR)/backend\`
`29`	`29`	`-I$(SRCHEADERDIR)\`
`30`	`30`	`-I$(LIBPQDIR)`
`31`	`31`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`	`# Makefile for example programs`
`3`	`3`	`#`
`4`	`4`
`5`		`-SRCDIR= ../..`
`6`		`-include ../../Makefile.global`
	`5`	`+SRCDIR= ../../..`
	`6`	`+include ../../../Makefile.global`
`7`	`7`
`8`	`8`	`LIBNAME= libpq++`
`9`	`9`
`@@ -15,8 +15,8 @@ CXXFLAGS= $(CFLAGS) -Wno-error`
`15`	`15`
`16`	`16`	`INCLUDE_OPT=\`
`17`	`17`	`-I..\`
`18`		`- -I../../backend\`
`19`		`- -I../../include\`
	`18`	`+ -I../../../backend\`
	`19`	`+ -I../../../include\`
`20`	`20`	`-I$(LIBPQDIR)\`
`21`	`21`	`-I$(HEADERDIR)`
`22`	`22`	`CXXFLAGS+=$(INCLUDE_OPT)`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,12 @@`
`4`	`4`	`# Makefile for doc directory to install man pages`
`5`	`5`	`#`
`6`	`6`	`# IDENTIFICATION`
`7`		`-# $Header: /cvsroot/pgsql/src/interfaces/libpq++/man/Attic/Makefile,v 1.2 1997/01/08 07:32:58 scrappy Exp $`
	`7`	`+# $Header: /cvsroot/pgsql/src/interfaces/libpq++/man/Attic/Makefile,v 1.3 1997/09/16 18:47:36 momjian Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`11`		`-SRCDIR= ../..`
`12`		`-include ../../Makefile.global`
	`11`	`+SRCDIR= ../../..`
	`12`	`+include ../../../Makefile.global`
`13`	`13`
`14`	`14`	`install:`
`15`	`15`	`-mkdir -p$(POSTMANDIR)`

Comments

(0)