projects
/
open-adventure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3d9885d
)
Fix Makefile issue that broke 'make dist'.
50/head
author
Jason S. Ninneman
<jsn@mbar.us>
Thu, 8 Jun 2017 02:39:41 +0000
(19:39 -0700)
committer
Jason S. Ninneman
<jsn@mbar.us>
Thu, 8 Jun 2017 03:20:52 +0000
(20:20 -0700)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index ee8c567ccf1f17c18e04d75e277fb4d9783c5393..ab304b8113f90adfb86fbb460af11966bd07bc30 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-10,13
+10,13
@@
ifeq ($(UNAME_S),Linux)
LIBS=-lrt
endif
LIBS=-lrt
endif
-OBJS=main.o init.o actions1.o actions2.o score.o misc.o
linenoise.o
-SOURCES=$(OBJS:.o=.c) dungeon.c advent.h funcs.h sizes.h adventure.text Makefile control
+OBJS=main.o init.o actions1.o actions2.o score.o misc.o
+SOURCES=$(OBJS:.o=.c) dungeon.c advent.h funcs.h sizes.h adventure.text Makefile control
linenoise/linenoise.h
.c.o:
$(CC) $(CCFLAGS) $(DBX) -c $<
.c.o:
$(CC) $(CCFLAGS) $(DBX) -c $<
-advent:
$(OBJS) databa
se.o
+advent:
$(OBJS) database.o linenoi
se.o
$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) database.o $(LDFLAGS) $(LIBS)
main.o: advent.h funcs.h database.h database.c sizes.h
$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) database.o $(LDFLAGS) $(LIBS)
main.o: advent.h funcs.h database.h database.c sizes.h
@@
-66,11
+66,12
@@
html: advent.html history.html hints.html
# README.adoc exists because that filename is magic on GitLab.
DOCS=COPYING NEWS README.adoc TODO advent.adoc history.adoc hints.adoc advent.6
# README.adoc exists because that filename is magic on GitLab.
DOCS=COPYING NEWS README.adoc TODO advent.adoc history.adoc hints.adoc advent.6
+TESTFILES=tests/*.log tests/*.chk tests/README tests/decheck tests/Makefile
# Can't use GNU tar's --transform, needs to build under Alpine Linux.
# This is a requirement for testing dist in GitLab's CI pipeline
advent-$(VERS).tar.gz: $(SOURCES) $(DOCS)
# Can't use GNU tar's --transform, needs to build under Alpine Linux.
# This is a requirement for testing dist in GitLab's CI pipeline
advent-$(VERS).tar.gz: $(SOURCES) $(DOCS)
- @find $(SOURCES) $(DOCS)
tests
-print | sed s:^:advent-$(VERS)/: >MANIFEST
+ @find $(SOURCES) $(DOCS)
$(TESTFILES)
-print | sed s:^:advent-$(VERS)/: >MANIFEST
@(ln -s . advent-$(VERS))
(tar -T MANIFEST -czvf advent-$(VERS).tar.gz)
@(rm advent-$(VERS))
@(ln -s . advent-$(VERS))
(tar -T MANIFEST -czvf advent-$(VERS).tar.gz)
@(rm advent-$(VERS))