diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2008-04-07 14:15:58 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2008-04-07 14:15:58 +0000 |
| commit | 46e76373ec6036a0a53206ef0ea87df75d082c48 (patch) | |
| tree | ca715a035d641cdd7af1bf074848e435da28a1df /src/backend | |
| parent | 8deafd6fdff78ce5412b6de75efc07ee7283a266 (diff) | |
| download | postgresql-46e76373ec6036a0a53206ef0ea87df75d082c48.tar.gz postgresql-46e76373ec6036a0a53206ef0ea87df75d082c48.zip | |
Implement a few changes to how shared libraries and dynamically loadable
modules are built. Foremost, it creates a solid distinction between these two
types of targets based on what had already been implemented and duplicated in
ad hoc ways before. Specifically,
- Dynamically loadable modules no longer get a soname. The numbers previously
set in the makefiles were dummy numbers anyway, and the presence of a soname
upset a few packaging tools, so it is nicer not to have one.
- The cumbersome detour taken on installation (build a libfoo.so.0.0.0 and
then override the rule to install foo.so instead) is removed.
- Lots of duplicated code simplified.
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/snowball/Makefile | 18 | ||||
| -rw-r--r-- | src/backend/utils/mb/conversion_procs/proc.mk | 15 |
2 files changed, 8 insertions, 25 deletions
diff --git a/src/backend/snowball/Makefile b/src/backend/snowball/Makefile index 466a507c089..a1d22f24c68 100644 --- a/src/backend/snowball/Makefile +++ b/src/backend/snowball/Makefile @@ -2,7 +2,7 @@ # # Makefile for src/backend/snowball # -# $PostgreSQL: pgsql/src/backend/snowball/Makefile,v 1.5 2008/03/18 16:24:50 petere Exp $ +# $PostgreSQL: pgsql/src/backend/snowball/Makefile,v 1.6 2008/04/07 14:15:58 petere Exp $ # #------------------------------------------------------------------------- @@ -77,11 +77,7 @@ else VPATH = $(srcdir)/libstemmer endif -SHLIB_LINK := $(BE_DLLLIBS) - NAME := dict_snowball -SO_MAJOR_VERSION := 0 -SO_MINOR_VERSION := 0 rpath = all: all-shared-lib $(SQLSCRIPT) @@ -116,10 +112,7 @@ else echo "-- No language-specific snowball dictionaries, for lack of shared library support" > $@ endif -install: all installdirs -ifeq ($(enable_shared), yes) - $(INSTALL_SHLIB) $(shlib) '$(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)' -endif +install: all installdirs install-lib $(INSTALL_DATA) $(SQLSCRIPT) '$(DESTDIR)$(datadir)' @set -e; \ set $(LANGUAGES) ; \ @@ -131,11 +124,10 @@ endif fi \ done -installdirs: - $(mkinstalldirs) '$(DESTDIR)$(pkglibdir)' '$(DESTDIR)$(datadir)' '$(DESTDIR)$(datadir)/$(DICTDIR)' +installdirs: installdirs-lib + $(mkinstalldirs) '$(DESTDIR)$(datadir)' '$(DESTDIR)$(datadir)/$(DICTDIR)' -uninstall: - rm -f '$(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)' +uninstall: uninstall-lib rm -f '$(DESTDIR)$(datadir)/$(SQLSCRIPT)' @set -e; \ set $(LANGUAGES) ; \ diff --git a/src/backend/utils/mb/conversion_procs/proc.mk b/src/backend/utils/mb/conversion_procs/proc.mk index 05bc2a4a09b..77322a452ef 100644 --- a/src/backend/utils/mb/conversion_procs/proc.mk +++ b/src/backend/utils/mb/conversion_procs/proc.mk @@ -1,26 +1,17 @@ SRCS += $(NAME).c OBJS += $(NAME).o -SHLIB_LINK := $(BE_DLLLIBS) - -SO_MAJOR_VERSION := 0 -SO_MINOR_VERSION := 0 rpath = all: all-shared-lib include $(top_srcdir)/src/Makefile.shlib -install: all installdirs -ifeq ($(enable_shared), yes) - $(INSTALL_SHLIB) $(shlib) '$(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)' -endif +install: all installdirs install-lib -installdirs: - $(mkinstalldirs) '$(DESTDIR)$(pkglibdir)' +installdirs: installdirs-lib -uninstall: - rm -f '$(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)' +uninstall: uninstall-lib clean distclean maintainer-clean: clean-lib rm -f $(OBJS) |