INN commit: trunk/storage/ovsqlite (ovmethod.mk)

INN Commit rra at isc.org
Wed Jan 6 22:40:55 UTC 2021


    Date: Wednesday, January 6, 2021 @ 14:40:55
  Author: iulius
Revision: 10501

Fix build with native BSD make

$^ seems to be not portable (unrecognized by BSD make).
Declare all objects, as done in other Makefiles.

Modified:
  trunk/storage/ovsqlite/ovmethod.mk

-------------+
 ovmethod.mk |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

Modified: ovmethod.mk
===================================================================
--- ovmethod.mk	2021-01-05 20:37:38 UTC (rev 10500)
+++ ovmethod.mk	2021-01-06 22:40:55 UTC (rev 10501)
@@ -1,9 +1,12 @@
-ovsqlite/ovsqlite-server: ovsqlite/ovsqlite-server.o ovsqlite/sql-main.o \
-		ovsqlite/sql-init.o ovsqlite/sqlite-helper.o \
-		ovsqlite/ovsqlite-private.o
-	$(LIBLD) $(LDFLAGS) $(SQLITE3_LDFLAGS) -o $@ $^ $(LIBSTORAGE) \
-		$(LIBHIST) $(LIBINN) $(STORAGE_LIBS) $(SQLITE3_LIBS) $(LIBS)
+OVSQLITEOBJECTS = ovsqlite/ovsqlite-server.o ovsqlite/sql-main.o \
+	ovsqlite/sql-init.o ovsqlite/sqlite-helper.o \
+	ovsqlite/ovsqlite-private.o
 
+ovsqlite/ovsqlite-server: ${OVSQLITEOBJECTS}
+	$(LIBLD) $(LDFLAGS) $(SQLITE3_LDFLAGS) -o $@ ${OVSQLITEOBJECTS} \
+	$(LIBSTORAGE) $(LIBHIST) $(LIBINN) $(STORAGE_LIBS) $(SQLITE3_LIBS) \
+	$(LIBS)
+
 ovsqlite/sqlite-helper-gen: ovsqlite/sqlite-helper-gen.in $(FIXSCRIPT)
 	$(FIXSCRIPT) -i ovsqlite/sqlite-helper-gen.in
 



More information about the inn-committers mailing list