Avoid multiple scans of utils/mb/conversion_procs/ subdirectories during
'make install'; there are enough of 'em that this slowed down the make noticeably. Ensure that 'all' is the default make target in all these directories (defaulting to 'make install' is surprising and dangerous IMHO). Fix a couple small typos.
This commit is contained in:
Tom Lane
parent
ba982373dc
commit
07c67187bf
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
# Copyright (c) 1994, Regents of the University of California
|
||||
#
|
||||
# $Header: /cvsroot/pgsql/src/Makefile,v 1.27 2002/07/30 17:47:58 tgl Exp $
|
||||
# $Header: /cvsroot/pgsql/src/Makefile,v 1.28 2002/09/04 15:45:50 tgl Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -16,6 +16,7 @@ include Makefile.global
|
|||
all install installdirs uninstall dep depend distprep:
|
||||
$(MAKE) -C port $@
|
||||
$(MAKE) -C backend $@
|
||||
$(MAKE) -C backend/utils/mb/conversion_procs $@
|
||||
$(MAKE) -C include $@
|
||||
$(MAKE) -C interfaces $@
|
||||
$(MAKE) -C bin $@
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
# Copyright (c) 1998, Regents of the University of California
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.61 2002/09/03 17:17:24 momjian Exp $
|
||||
# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.62 2002/09/04 15:45:50 tgl Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -276,8 +276,13 @@ endif # enable_shared
|
|||
## BUILD
|
||||
##
|
||||
|
||||
.PHONY: all-lib
|
||||
all-lib: lib$(NAME).a $(shlib)
|
||||
.PHONY: all-lib all-static-lib all-shared-lib
|
||||
|
||||
all-lib: all-static-lib all-shared-lib
|
||||
|
||||
all-static-lib: lib$(NAME).a
|
||||
|
||||
all-shared-lib: $(shlib)
|
||||
|
||||
ifneq ($(PORTNAME), win)
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
# Copyright (c) 1994, Regents of the University of California
|
||||
#
|
||||
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.85 2002/08/21 20:42:24 petere Exp $
|
||||
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.86 2002/09/04 15:45:50 tgl Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -30,7 +30,6 @@ endif
|
|||
##########################################################################
|
||||
|
||||
all: submake-libpgport postgres $(POSTGRES_IMP)
|
||||
$(MAKE) -C utils/mb/conversion_procs $@
|
||||
|
||||
ifneq ($(PORTNAME), win)
|
||||
|
||||
|
|
@ -122,8 +121,6 @@ endif
|
|||
$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample $(DESTDIR)$(datadir)/pg_hba.conf.sample
|
||||
$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample $(DESTDIR)$(datadir)/pg_ident.conf.sample
|
||||
$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample $(DESTDIR)$(datadir)/postgresql.conf.sample
|
||||
$(MAKE) -C utils/mb $@
|
||||
$(MAKE) -C utils/mb/conversion_procs $@
|
||||
|
||||
install-bin: postgres $(POSTGRES_IMP) installdirs
|
||||
$(INSTALL_PROGRAM) postgres$(X) $(DESTDIR)$(bindir)/postgres$(X)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# Makefile for utils/mb
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/backend/utils/mb/Makefile,v 1.20 2002/08/08 07:47:43 ishii Exp $
|
||||
# $Header: /cvsroot/pgsql/src/backend/utils/mb/Makefile,v 1.21 2002/09/04 15:45:50 tgl Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -15,7 +15,9 @@ include $(top_builddir)/src/Makefile.global
|
|||
OBJS = encnames.o conv.o mbutils.o wchar.o wstrcmp.o wstrncmp.o
|
||||
DIRS = conversion_procs
|
||||
|
||||
all install installdirs uninstal distprep: SUBSYS.o
|
||||
all install installdirs: SUBSYS.o
|
||||
|
||||
uninstall distprep:
|
||||
|
||||
clean distclean maintainer-clean:
|
||||
rm -f SUBSYS.o $(OBJS)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# Makefile for utils/mb/conversion_procs
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.5 2002/08/22 00:01:44 tgl Exp $
|
||||
# $Header: /cvsroot/pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.6 2002/09/04 15:45:50 tgl Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -143,6 +143,9 @@ CONVERSIONS = \
|
|||
utf_8_to_win874 UNICODE WIN874 utf_to_win874 utf8_and_win874 \
|
||||
win874_to_utf_8 WIN874 UNICODE win874_to_utf utf8_and_win874
|
||||
|
||||
all: $(SQLSCRIPT)
|
||||
@for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done
|
||||
|
||||
$(SQLSCRIPT): Makefile
|
||||
@set $(CONVERSIONS) ; \
|
||||
while [ "$$#" -gt 0 ] ; \
|
||||
|
|
@ -174,21 +177,18 @@ $(REGRESSION_SCRIPT): Makefile
|
|||
done >> $@; \
|
||||
cat regress_epilogue >> $@;
|
||||
|
||||
install: all installdirs
|
||||
install: $(SQLSCRIPT) installdirs
|
||||
$(INSTALL_DATA) $(SQLSCRIPT) $(DESTDIR)$(datadir)
|
||||
@for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done
|
||||
|
||||
installdirs:
|
||||
$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
|
||||
$(mkinstalldirs) $(DESTDIR)$(datadir) $(DESTDIR)$(pkglibdir)
|
||||
|
||||
all: $(SQLSCRIPT)
|
||||
@for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done
|
||||
uninstall:
|
||||
|
||||
clean:
|
||||
$(RM) $(SQLSCRIPT)
|
||||
@for dir in $(DIRS); do $(MAKE) -C $$dir $@; done
|
||||
|
||||
distclean maintainer-clean:
|
||||
dep depend distprep:
|
||||
|
||||
clean distclean maintainer-clean:
|
||||
$(RM) $(SQLSCRIPT)
|
||||
@for dir in $(DIRS); do $(MAKE) -C $$dir $@; done
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,10 @@ SO_MAJOR_VERSION := 0
|
|||
SO_MINOR_VERSION := 0
|
||||
rpath =
|
||||
|
||||
all: all-shared-lib
|
||||
|
||||
include $(top_srcdir)/src/Makefile.shlib
|
||||
|
||||
install: all
|
||||
$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)
|
||||
|
||||
|
|
@ -15,7 +19,3 @@ uninstall: uninstall-lib
|
|||
|
||||
clean distclean maintainer-clean: clean-lib
|
||||
$(RM) $(OBJS)
|
||||
|
||||
include $(top_srcdir)/src/Makefile.shlib
|
||||
|
||||
all: $(shlib)
|
||||
|
|
|
|||
Loading…
Reference in New Issue