Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3cbb9eb

Browse files
committed
Move few remaining src/utils files to backend/port so everything is in
one place. Everything may be moved to src/utils eventually.Add DLLINIT variable to simplify makfiles.
1 parentd76eef3 commit3cbb9eb

File tree

10 files changed

+34
-57
lines changed

10 files changed

+34
-57
lines changed

‎configure

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11603,7 +11603,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
1160311603
_ACEOF
1160411604
1160511605
else
11606-
STRDUP='$(top_builddir)/src/utils/strdup.o'
11606+
STRDUP='$(top_builddir)/src/backend/port/strdup.o'
1160711607
fi
1160811608
done
1160911609
@@ -11846,6 +11846,13 @@ done
1184611846
1184711847
1184811848
11849+
# Set path of dllinit.c for cygwin
11850+
DLLINIT=""
11851+
case$host_osin
11852+
cygwin*) DLLINIT='$(top_builddir)/src/backend/port/dllinit.o' ;;
11853+
esac
11854+
11855+
1184911856
# On HPUX 9, rint() is not in regular libm.a but in /lib/pa1.1/libm.a;
1185011857
# this hackery with HPUXMATHLIB allows us to cope.
1185111858
HPUXMATHLIB=""
@@ -16673,6 +16680,7 @@ else
1667316680
sgml/stylesheets/nwalsh-modular \
1667416681
sgml/stylesheets/docbook \
1667516682
sgml/docbook/dsssl/modular \
16683+
sgml/docbook/stylesheet/dsssl/modular \
1667616684
sgml/docbook/dsssl-stylesheets
1667716685
do
1667816686
pgac_candidate=$pgac_prefix/$pgac_infix/$pgac_postfix
@@ -17526,6 +17534,7 @@ s,@STRDUP@,$STRDUP,;t t
1752617534
s,@STRTOL@,$STRTOL,;t t
1752717535
s,@STRTOUL@,$STRTOUL,;t t
1752817536
s,@STRCASECMP@,$STRCASECMP,;t t
17537+
s,@DLLINIT@,$DLLINIT,;t t
1752917538
s,@HPUXMATHLIB@,$HPUXMATHLIB,;t t
1753017539
s,@HAVE_POSIX_SIGNALS@,$HAVE_POSIX_SIGNALS,;t t
1753117540
s,@MSGFMT@,$MSGFMT,;t t

‎configure.in

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $Header: /cvsroot/pgsql/configure.in,v 1.189 2002/07/15 22:41:45 momjian Exp $
2+
dnl $Header: /cvsroot/pgsql/configure.in,v 1.190 2002/07/16 05:46:35 momjian Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -916,7 +916,7 @@ AC_CHECK_FUNCS(inet_aton, [], INET_ATON='$(top_builddir)/src/backend/port/inet_a
916916
AC_SUBST(INET_ATON)
917917
AC_CHECK_FUNCS(strerror, [], STRERROR='$(top_builddir)/src/backend/port/strerror.o')
918918
AC_SUBST(STRERROR)
919-
AC_CHECK_FUNCS(strdup, [], STRDUP='$(top_builddir)/src/utils/strdup.o')
919+
AC_CHECK_FUNCS(strdup, [], STRDUP='$(top_builddir)/src/backend/port/strdup.o')
920920
AC_SUBST(STRDUP)
921921
AC_CHECK_FUNCS(strtol, [], STRTOL='$(top_builddir)/src/backend/port/strtol.o')
922922
AC_SUBST(STRTOL)
@@ -925,6 +925,13 @@ AC_SUBST(STRTOUL)
925925
AC_CHECK_FUNCS(strcasecmp, [], STRCASECMP='$(top_builddir)/src/backend/port/strcasecmp.o')
926926
AC_SUBST(STRCASECMP)
927927

928+
# Set path of dllinit.c for cygwin
929+
DLLINIT=""
930+
case $host_os in
931+
cygwin*) DLLINIT='$(top_builddir)/src/backend/port/dllinit.o' ;;
932+
esac
933+
AC_SUBST(DLLINIT)
934+
928935
# On HPUX 9, rint() is not in regular libm.a but in /lib/pa1.1/libm.a;
929936
# this hackery with HPUXMATHLIB allows us to cope.
930937
HPUXMATHLIB=""

‎src/Makefile.global.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-makefile-*-
2-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.148 2002/05/28 16:57:53 petere Exp $
2+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.149 2002/07/16 05:46:35 momjian Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -359,6 +359,7 @@ STRDUP = @STRDUP@
359359
STRERROR = @STRERROR@
360360
STRTOL = @STRTOL@
361361
STRTOUL = @STRTOUL@
362+
DLLINIT = @DLLINIT@
362363

363364
TAS = @TAS@
364365

‎src/Makefile.shlib

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Copyright (c) 1998, Regents of the University of California
77
#
88
# IDENTIFICATION
9-
# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.58 2002/05/24 18:10:17 petere Exp $
9+
# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.59 2002/07/16 05:46:35 momjian Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -327,13 +327,13 @@ endif # PORTNAME == aix
327327
else # PORTNAME == win
328328

329329
# WIN case
330-
$(shlib) lib$(NAME).a: $(OBJS) $(top_builddir)/src/utils/dllinit.o
330+
$(shlib) lib$(NAME).a: $(OBJS) $(DLLINIT)
331331
$(DLLTOOL) --export-all --output-def $(NAME).def $(OBJS)
332-
$(DLLWRAP) -o $(shlib) --dllname $(shlib) --def $(NAME).def $(OBJS) $(top_builddir)/src/utils/dllinit.o $(DLLINIT) $(DLLLIBS) $(SHLIB_LINK)
332+
$(DLLWRAP) -o $(shlib) --dllname $(shlib) --def $(NAME).def $(OBJS) $(DLLINIT) $(DLLLIBS) $(SHLIB_LINK)
333333
$(DLLTOOL) --dllname $(shlib) --def $(NAME).def --output-lib lib$(NAME).a
334334

335-
$(top_builddir)/src/utils/dllinit.o: $(top_srcdir)/src/utils/dllinit.c
336-
$(MAKE) -C $(top_builddir)/src/utils dllinit.o
335+
$(DLLINIT):
336+
$(MAKE) -C $(@D) $(@F)
337337

338338
endif # PORTNAME == win
339339

‎src/backend/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.79 2002/05/22 21:46:40 tgl Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.80 2002/07/16 05:46:35 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -43,7 +43,7 @@ else # win
4343

4444
# No points for style here. How about encapsulating some of these
4545
# commands into variables?
46-
postgres:$(OBJS)$(top_builddir)/src/utils/dllinit.o postgres.def libpostgres.a
46+
postgres:$(OBJS)$(DLLINIT) postgres.def libpostgres.a
4747
dlltool --dllname$@$(X) --output-exp$@.exp --def postgres.def
4848
gcc$(LDFLAGS) -g -o$@$(X) -Wl,--base-file,$@.base$@.exp$(OBJS)$(DLLLIBS)
4949
dlltool --dllname$@$(X) --base-file$@.base --output-exp$@.exp --def postgres.def
@@ -67,14 +67,14 @@ ifeq ($(MAKE_DLL), true)
6767
postgres.def:$(OBJS)
6868
$(DLLTOOL) --export-all --output-def$@$(OBJS)
6969

70-
libpostgres.a:$(OBJS)$(top_builddir)/src/utils/dllinit.o postgres.def
70+
libpostgres.a:$(OBJS)$(DLLINIT) postgres.def
7171
$(DLLTOOL) --dllname postgres.exe --def postgres.def --output-lib$@
7272

7373
endif# MAKE_DLL
7474

7575

76-
$(top_builddir)/src/utils/dllinit.o:$(top_srcdir)/src/utils/dllinit.c
77-
$(MAKE) -C$(top_builddir)/src/utils dllinit.o
76+
$(DLLINIT):
77+
$(MAKE) -C$(@D)$(@F)
7878

7979
# The postgres.o target is needed by the rule in Makefile.global that
8080
# creates the exports file when MAKE_EXPORTS = true.
File renamed without changes.

‎src/utils/strdup.crenamed to‎src/backend/port/strdup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/utils/Attic/strdup.c,v 1.9 2002/06/20 20:29:54 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/port/Attic/strdup.c,v 1.3 2002/07/16 05:46:35 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/

‎src/makefiles/Makefile.win

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.15 2001/09/06 02:58:33 momjian Exp $
1+
# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.16 2002/07/16 05:46:35 momjian Exp $
22
LDFLAGS+= -g
33
DLLTOOL= dlltool
44
DLLWRAP= dllwrap
@@ -17,7 +17,7 @@ CFLAGS_SL =
1717

1818
%.dll: %.o
1919
$(DLLTOOL) --export-all --output-def $*.def $<
20-
$(DLLWRAP) -o $@ --def $*.def $< $(top_builddir)/src/utils/dllinit.o $(DLLLIBS)
20+
$(DLLWRAP) -o $@ --def $*.def $< $(DLLINIT) $(DLLLIBS)
2121
rm -f $*.def
2222

2323
ifeq ($(findstring backend,$(subdir)), backend)

‎src/utils/Makefile

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎src/utils/README

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp