aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2007-01-07 08:49:31 +0000
committerPeter Eisentraut <peter_e@gmx.net>2007-01-07 08:49:31 +0000
commitfe733968eabdabffa0ba4965263a49640575f741 (patch)
tree8981af5f913393d97c72c09c69eba60eb561bd4e /src
parent53a11befc843d40cc50ab26e04fe69c5912b6fde (diff)
downloadpostgresql-fe733968eabdabffa0ba4965263a49640575f741.tar.gz
postgresql-fe733968eabdabffa0ba4965263a49640575f741.zip
Indent comments in makefiles better so they don't appear in the output.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.shlib8
-rw-r--r--src/backend/port/Makefile4
-rw-r--r--src/interfaces/libpq/Makefile5
3 files changed, 10 insertions, 7 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 10cc94a4888..c8736298f01 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -6,7 +6,7 @@
# Copyright (c) 1998, Regents of the University of California
#
# IDENTIFICATION
-# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.105 2006/09/19 15:36:07 tgl Exp $
+# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.106 2007/01/07 08:49:31 petere Exp $
#
#-------------------------------------------------------------------------
@@ -193,7 +193,8 @@ ifeq ($(PORTNAME), solaris)
ifeq ($(GCC), yes)
LINK.shared = $(CC) -shared
else
- LINK.shared = $(CC) -G $(CFLAGS) # CFLAGS added for X86_64
+# CFLAGS added for X86_64
+ LINK.shared = $(CC) -G $(CFLAGS)
endif
ifeq ($(with_gnu_ld), yes)
LINK.shared += -Wl,-soname,$(soname)
@@ -354,7 +355,8 @@ endif
ifeq ($(enable_shared), yes)
install-lib-shared: $(shlib)
-ifneq ($(PORTNAME), aix) # we don't install $(shlib) on AIX
+# we don't install $(shlib) on AIX
+ifneq ($(PORTNAME), aix)
$(INSTALL_SHLIB) $< '$(DESTDIR)$(libdir)/$(shlib)'
ifneq ($(PORTNAME), cygwin)
ifneq ($(PORTNAME), win32)
diff --git a/src/backend/port/Makefile b/src/backend/port/Makefile
index be5db0a664b..3608cd5c4b7 100644
--- a/src/backend/port/Makefile
+++ b/src/backend/port/Makefile
@@ -13,7 +13,7 @@
# be converted to Method 2.
#
# IDENTIFICATION
-# $PostgreSQL: pgsql/src/backend/port/Makefile,v 1.23 2006/04/28 17:09:16 momjian Exp $
+# $PostgreSQL: pgsql/src/backend/port/Makefile,v 1.24 2007/01/07 08:49:31 petere Exp $
#
#-------------------------------------------------------------------------
@@ -49,7 +49,7 @@ win32.dir:
tas.o: tas.s
ifeq ($(PORTNAME), solaris)
- # preprocess assembler file with cpp, used by x86
+# preprocess assembler file with cpp, used by x86
$(CC) $(CFLAGS) -c -P $<
mv $*.i $*_cpp.s
$(CC) $(CFLAGS) -c $*_cpp.s -o $@
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index b29adbdd30b..2b33e766b96 100644
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
#
-# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.153 2007/01/05 22:20:00 momjian Exp $
+# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.154 2007/01/07 08:49:31 petere Exp $
#
#-------------------------------------------------------------------------
@@ -170,7 +170,8 @@ uninstall: uninstall-lib
clean distclean: clean-lib
rm -f $(OBJS) pg_config_paths.h crypt.c getaddrinfo.c inet_aton.c noblock.c open.c pgstrcasecmp.c snprintf.c strerror.c strlcpy.c thread.c md5.c ip.c encnames.c wchar.c pthread.h exports.list
- rm -f pg_config_paths.h # Might be left over from a Win32 client-only build
+# Might be left over from a Win32 client-only build
+ rm -f pg_config_paths.h
maintainer-clean: distclean
rm -f $(srcdir)/libpqdll.def $(srcdir)/libpqddll.def $(srcdir)/blibpqdll.def $(srcdir)/libpq.rc