diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2002-09-04 15:45:50 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2002-09-04 15:45:50 +0000 |
| commit | 07c67187bf2ce76febd01f69b51d309d54246505 (patch) | |
| tree | ea6ac04d703e154d215bd64a3a73a096c05a88c2 /src/backend/utils/mb/conversion_procs | |
| parent | ba982373dc6d165b8ba5225bfc1fc758d0f496fe (diff) | |
| download | postgresql-07c67187bf2ce76febd01f69b51d309d54246505.tar.gz postgresql-07c67187bf2ce76febd01f69b51d309d54246505.zip | |
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.
Diffstat (limited to 'src/backend/utils/mb/conversion_procs')
| -rw-r--r-- | src/backend/utils/mb/conversion_procs/Makefile | 18 | ||||
| -rw-r--r-- | src/backend/utils/mb/conversion_procs/proc.mk | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/backend/utils/mb/conversion_procs/Makefile b/src/backend/utils/mb/conversion_procs/Makefile index 8e843bf44f5..0f170c2f8f0 100644 --- a/src/backend/utils/mb/conversion_procs/Makefile +++ b/src/backend/utils/mb/conversion_procs/Makefile @@ -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 +dep depend distprep: -distclean maintainer-clean: +clean distclean maintainer-clean: $(RM) $(SQLSCRIPT) @for dir in $(DIRS); do $(MAKE) -C $$dir $@; done diff --git a/src/backend/utils/mb/conversion_procs/proc.mk b/src/backend/utils/mb/conversion_procs/proc.mk index 1dc77d94648..8c9279e9aaf 100644 --- a/src/backend/utils/mb/conversion_procs/proc.mk +++ b/src/backend/utils/mb/conversion_procs/proc.mk @@ -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) |