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

Commit69bf0a0

Browse files
committed
Remove dllinit.c; it was only needed for long-obsolete Cygwin versions,
and there was some question about its copyright status.
1 parent3a04f53 commit69bf0a0

File tree

6 files changed

+8
-162
lines changed

6 files changed

+8
-162
lines changed

‎src/Makefile

Lines changed: 1 addition & 4 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-
# $PostgreSQL: pgsql/src/Makefile,v 1.39 2006/02/04 01:04:20 momjian Exp $
7+
# $PostgreSQL: pgsql/src/Makefile,v 1.40 2006/06/22 23:50:35 tgl Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -23,7 +23,6 @@ all install installdirs uninstall dep depend distprep:
2323
$(MAKE) -C bin$@
2424
$(MAKE) -C pl$@
2525
$(MAKE) -C makefiles$@
26-
$(MAKE) -C utils$@
2726
$(MAKE) -C test/regress$@
2827

2928
install: install-local
@@ -55,7 +54,6 @@ clean:
5554
$(MAKE) -C makefiles$@
5655
$(MAKE) -Ctest$@
5756
$(MAKE) -C tutorial NO_PGXS=1$@
58-
$(MAKE) -C utils$@
5957
$(MAKE) -C test/thread$@
6058

6159
distcleanmaintainer-clean:
@@ -69,7 +67,6 @@ distclean maintainer-clean:
6967
-$(MAKE) -C makefiles$@
7068
-$(MAKE) -Ctest$@
7169
-$(MAKE) -C tutorial NO_PGXS=1$@
72-
-$(MAKE) -C utils$@
7370
-$(MAKE) -C test/thread$@
7471
rm -f Makefile.port Makefile.global
7572

‎src/backend/Makefile

Lines changed: 3 additions & 6 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-
# $PostgreSQL: pgsql/src/backend/Makefile,v 1.115 2006/06/18 15:38:36 petere Exp $
7+
# $PostgreSQL: pgsql/src/backend/Makefile,v 1.116 2006/06/22 23:50:35 tgl Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -44,7 +44,7 @@ endif
4444

4545
ifeq ($(PORTNAME), cygwin)
4646

47-
postgres:$(OBJS)$(DLLINIT)postgres.def libpostgres.a
47+
postgres:$(OBJS) postgres.def libpostgres.a
4848
$(DLLTOOL) --dllname$@$(X) --output-exp$@.exp --def postgres.def
4949
$(CC)$(CFLAGS)$(LDFLAGS) -o$@$(X) -Wl,--base-file,$@.base$@.exp$(OBJS)$(LIBS)
5050
$(DLLTOOL) --dllname$@$(X) --base-file$@.base --output-exp$@.exp --def postgres.def
@@ -61,7 +61,7 @@ endif # cygwin
6161

6262
ifeq ($(PORTNAME), win32)
6363

64-
postgres:$(OBJS)$(DLLINIT)postgres.def libpostgres.a$(WIN32RES)
64+
postgres:$(OBJS) postgres.def libpostgres.a$(WIN32RES)
6565
$(DLLTOOL) --dllname$@$(X) --output-exp$@.exp --def postgres.def
6666
$(CC)$(CFLAGS)$(LDFLAGS) -o$@$(X) -Wl,--base-file,$@.base$@.exp$(OBJS)$(WIN32RES)$(LIBS)
6767
$(DLLTOOL) --dllname$@$(X) --base-file$@.base --output-exp$@.exp --def postgres.def
@@ -105,9 +105,6 @@ $(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir
105105
$(MAKE) -C $(subst -recursive,,$@) all
106106

107107

108-
$(DLLINIT):$(DLLINIT:%.o=%.c)
109-
$(MAKE) -C$(@D)$(@F)
110-
111108
# The postgres.o target is needed by the rule in Makefile.global that
112109
# creates the exports file when MAKE_EXPORTS = true.
113110
postgres.o:$(OBJS)

‎src/makefiles/Makefile.cygwin

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
# $PostgreSQL: pgsql/src/makefiles/Makefile.cygwin,v 1.8 2006/01/19 20:45:29 momjian Exp $
1+
# $PostgreSQL: pgsql/src/makefiles/Makefile.cygwin,v 1.9 2006/06/22 23:50:35 tgl Exp $
22
DLLTOOL= dlltool
33
DLLWRAP= dllwrap
44
ifdef PGXS
55
BE_DLLLIBS= -L$(libdir) -lpostgres
66
else
77
BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
88
endif
9-
DLLINIT = $(top_builddir)/src/utils/dllinit.o
109

1110
# linking with -lm or -lc causes program to crash
1211
# (see http://sources.redhat.com/cygwin/faq/faq.html#SEC110)
@@ -18,7 +17,7 @@ CFLAGS_SL =
1817

1918
%.dll: %.o
2019
$(DLLTOOL) --export-all --output-def $*.def $<
21-
$(DLLWRAP) -o $@ --def $*.def $< $(DLLINIT) $(SHLIB_LINK)
20+
$(DLLWRAP) -o $@ --def $*.def $< $(SHLIB_LINK)
2221
rm -f $*.def
2322

2423
ifneq (,$(findstring backend,$(subdir)))

‎src/makefiles/Makefile.win32

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.9 2006/01/19 20:45:29 momjian Exp $
1+
# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.10 2006/06/22 23:50:35 tgl Exp $
22

33
# Use replacement include files for those missing on Win32
44
override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32"
@@ -10,15 +10,14 @@ BE_DLLLIBS= -L$(libdir) -lpostgres
1010
else
1111
BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
1212
endif
13-
DLLINIT = $(top_builddir)/src/utils/dllinit.o
1413

1514
AROPT = crs
1615
DLSUFFIX = .dll
1716
CFLAGS_SL =
1817

1918
%.dll: %.o
2019
$(DLLTOOL) --export-all --output-def $*.def $<
21-
$(DLLWRAP) -o $@ --def $*.def $< $(DLLINIT) $(SHLIB_LINK)
20+
$(DLLWRAP) -o $@ --def $*.def $< $(SHLIB_LINK)
2221
rm -f $*.def
2322

2423
ifneq (,$(findstring backend,$(subdir)))

‎src/utils/Makefile

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

‎src/utils/dllinit.c

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

0 commit comments

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