Fix build problems in commit aa65de0.

robertmhaas · robertmhaas · commit 2ccc4e972eb8 · 2015-09-11T14:56:17.000-04:00
The previous way didn't work for vpath builds, and make distprep was
busted too.

Reported off-list by Andres Freund.
diff --git a/src/backend/Makefile b/src/backend/Makefile
@@ -200,7 +200,7 @@ distprep:
 	$(MAKE) -C bootstrap	bootparse.c bootscanner.c
 	$(MAKE) -C catalog	schemapg.h postgres.bki postgres.description postgres.shdescription
 	$(MAKE) -C replication	repl_gram.c repl_scanner.c
-	$(MAKE) -C storage	lwlocknames.h
+	$(MAKE) -C storage/lmgr	lwlocknames.h
 	$(MAKE) -C utils	fmgrtab.c fmgroids.h errcodes.h
 	$(MAKE) -C utils/misc	guc-file.c
 	$(MAKE) -C utils/sort	qsort_tuple.c
diff --git a/src/backend/storage/lmgr/Makefile b/src/backend/storage/lmgr/Makefile
@@ -12,7 +12,8 @@ subdir = src/backend/storage/lmgr
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = lmgr.o lock.o proc.o deadlock.o lwlock.o spin.o s_lock.o predicate.o
+OBJS = lmgr.o lock.o proc.o deadlock.o lwlock.o lwlocknames.o spin.o \
+	s_lock.o predicate.o
 
 include $(top_srcdir)/src/backend/common.mk
 
diff --git a/src/backend/storage/lmgr/generate-lwlocknames.pl b/src/backend/storage/lmgr/generate-lwlocknames.pl
@@ -23,7 +23,7 @@
 print H "/* there is deliberately not an #ifndef LWLOCKNAMES_H here */\n\n";
 print C $autogen, "\n";
 
-print C "static char *MainLWLockNames[] = {";
+print C "char *MainLWLockNames[] = {";
 
 while (<$lwlocknames>)
 {
diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c
@@ -95,9 +95,6 @@
 #include "utils/hsearch.h"
 #endif
 
-/* Constants for lwlock names */
-#include "lwlocknames.c"
-
 
 /* We use the ShmemLock spinlock to protect LWLockAssign */
 extern slock_t *ShmemLock;
diff --git a/src/include/storage/lwlock.h b/src/include/storage/lwlock.h
@@ -90,9 +90,10 @@ typedef union LWLockPadded
 	char		pad[LWLOCK_PADDED_SIZE];
 } LWLockPadded;
 extern PGDLLIMPORT LWLockPadded *MainLWLockArray;
+extern char *MainLWLockNames[];
 
 /* Names for fixed lwlocks */
-#include "lwlocknames.h"
+#include "storage/lwlocknames.h"
 
 /*
  * It's a bit odd to declare NUM_BUFFER_PARTITIONS and NUM_LOCK_PARTITIONS

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`print H "/* there is deliberately not an #ifndef LWLOCKNAMES_H here */\n\n";`
`24`	`24`	`print C $autogen, "\n";`
`25`	`25`
`26`		`-print C "static char *MainLWLockNames[] = {";`
	`26`	`+print C "char *MainLWLockNames[] = {";`
`27`	`27`
`28`	`28`	`while (<$lwlocknames>)`
`29`	`29`	`{`