Skip to content

Commit 5a4c1dd

Browse files
authored
Merge pull request #56 from postgrespro/fix_windows_build
Simplify the Makefile to fix MSVC build.
2 parents 72f0e96 + d36b971 commit 5a4c1dd

File tree

3 files changed

+1
-8
lines changed

3 files changed

+1
-8
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
*.o
33
*.so
44
/results
5-
*pg_wait_sampling--1.1.sql
65
.log
76
Dockerfile
87
/log/

Makefile

+1-7
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@ MODULE_big = pg_wait_sampling
44
OBJS = pg_wait_sampling.o collector.o
55

66
EXTENSION = pg_wait_sampling
7-
EXTVERSION = 1.1
8-
DATA_built = pg_wait_sampling--$(EXTVERSION).sql
9-
DATA = pg_wait_sampling--1.0--1.1.sql
7+
DATA = pg_wait_sampling--1.1.sql pg_wait_sampling--1.0--1.1.sql
108

119
REGRESS = load queries
1210

1311
EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add
14-
EXTRA_CLEAN = pg_wait_sampling--$(EXTVERSION).sql
1512

1613
ifdef USE_PGXS
1714
PG_CONFIG = pg_config
@@ -24,9 +21,6 @@ include $(top_builddir)/src/Makefile.global
2421
include $(top_srcdir)/contrib/contrib-global.mk
2522
endif
2623

27-
$(EXTENSION)--$(EXTVERSION).sql: setup.sql
28-
cat $^ > $@
29-
3024
# Prepare the package for PGXN submission
3125
package: dist .git
3226
$(eval DISTVERSION := $(shell git tag -l | tail -n 1 | cut -d 'v' -f 2))
File renamed without changes.

0 commit comments

Comments
 (0)