NotificationsYou must be signed in to change notification settings
Fork15
Star22

Commit26def74

committed

Add epochprop into variable assignments for REGRESS and TESTS to simplify Makefile and also other minor cleanups to Makefile

1 parent4eb0e3a commit26def74Copy full SHA for 26def74

File tree

1 file changed

-12

lines changed

Makefile

1 file changed

-12

lines changed

`‎Makefile`

Lines changed: 8 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,25 +30,22 @@ DATA_built = $(RELEASE_SQL) \`
`30`	`30`
`31`	`31`	`DOCS = README.pg_sphere COPYRIGHT.pg_sphere`
`32`	`32`	`REGRESS = init tables points euler circle line ellipse poly path box index\`
`33`		`- contains_ops contains_ops_compat bounding_box_gist gnomo`
	`33`	`+ contains_ops contains_ops_compat bounding_box_gist gnomo epochprop`
`34`	`34`
`35`	`35`	`ifneq ($(USE_HEALPIX),0)`
`36`	`36`	`REGRESS += healpix moc mocautocast`
`37`	`37`	`endif`
`38`	`38`
`39`		`-REGRESS += epochprop`
`40`		`-`
`41`	`39`	`REGRESS_9_5 = index_9.5# experimental for spoint3`
`42`	`40`
`43`	`41`	`TESTS = init_test tables points euler circle line ellipse poly path box\`
`44`		`- index contains_ops contains_ops_compat bounding_box_gist gnomo`
	`42`	`+ index contains_ops contains_ops_compat bounding_box_gist gnomo\`
	`43`	`+ epochprop`
`45`	`44`
`46`	`45`	`ifneq ($(USE_HEALPIX),0)`
`47`	`46`	`TESTS += healpix moc mocautocast`
`48`	`47`	`endif`
`49`	`48`
`50`		`-TESTS += epochprop`
`51`		`-`
`52`	`49`	`PG_CFLAGS+= -DPGSPHERE_VERSION=$(PGSPHERE_VERSION)`
`53`	`50`	`PG_CPPFLAGS+= -DPGSPHERE_VERSION=$(PGSPHERE_VERSION)`
`54`	`51`
`@@ -85,7 +82,7 @@ PGS_SQL_9_5 = pgs_9.5.sql # experimental for spoint3`
`85`	`82`
`86`	`83`	`ifdefUSE_PGXS`
`87`	`84`	`ifndef PG_CONFIG`
`88`		`-PG_CONFIG:= pg_config`
	`85`	`+PG_CONFIG = pg_config`
`89`	`86`	`endif`
`90`	`87`	`PGXS :=$(shell$(PG_CONFIG) --pgxs)`
`91`	`88`	`include$(PGXS)`
`@@ -98,8 +95,8 @@ else`
`98`	`95`	`endif`
`99`	`96`
`100`	`97`	`ifneq ($(USE_HEALPIX),0)`
`101`		`-# compiler settings`
`102`		`-PKG_CONFIG = pkg-config`
	`98`	`+# compiler settings for linking with libhealpix_cxx`
	`99`	`+PKG_CONFIG?= pkg-config`
`103`	`100`	`overrideCPPFLAGS +=$(shell$(PKG_CONFIG) --cflags healpix_cxx)`
`104`	`101`	`SHLIB_LINK +=$(shell$(PKG_CONFIG) --libs healpix_cxx)`
`105`	`102`	`LINK.shared = g++ -shared`
`@@ -113,7 +110,6 @@ healpix_bare/healpix_bare.o : healpix_bare/healpix_bare.c`
`113`	`110`	`pg_version :=$(word 2,$(shell$(PG_CONFIG) --version))`
`114`	`111`	`pg_version_9_5_plus =$(if$(filter-out 9.1% 9.2% 9.3% 9.4%,$(pg_version)),y,n)`
`115`	`112`	`has_explain_summary =$(if$(filter-out 9.%,$(pg_version)),y,n)`
`116`		`-#`
`117`	`113`
`118`	`114`	`## the use of spoint 3 is too experimental and preliminary:`
`119`	`115`	`#ifeq ($(pg_version_9_5_plus),y)`
`@@ -149,14 +145,14 @@ $(RELEASE_SQL): $(addsuffix .in, $(RELEASE_SQL) $(PGS_SQL))`
`149`	`145`
`150`	`146`	`# for "create extension from unpacked*":`
`151`	`147`
`152`		`-UPGRADE_UNP_COMMON =pgs_types.sql pgs_point.sql pgs_euler.sql pgs_circle.sql\`
	`148`	`+UPGRADE_UNP_COMMON = pgs_types.sql pgs_point.sql pgs_euler.sql pgs_circle.sql\`
`153`	`149`	`pgs_line.sql pgs_ellipse.sql pgs_polygon.sql pgs_path.sql\`
`154`	`150`	`pgs_box.sql pgs_contains_ops_compat.sql pgs_gist.sql\`
`155`	`151`	`pgs_gist_contains_ops.sql contains-ops-fixes-1.sql`
`156`	`152`
`157`	`153`	`AUGMENT_UNP_COMMON = upgrade_scripts/pgs_pre111.sql pgs_contains_ops.sql\`
`158`	`154`	`gnomo.sql`
`159`		`-# for vanilla 1.1.1 users`
	`155`	`+# for vanilla 1.1.1 users:`
`160`	`156`	`AUGMENT_UNP_111 =$(AUGMENT_UNP_COMMON) pgs_gist_pointkey.sql`
`161`	`157`
`162`	`158`	`# for 1.1.2+ users: 'from unpacked_1.1.2plus'`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit26def74

File tree

1 file changed

1 file changed

`‎Makefile`

0 commit comments