Skip to content

Commit d4818d5

Browse files
committed
Re-generate the Makefiles
1 parent f2cf51b commit d4818d5

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ subdirs:
2727
else $(MAKE); fi) || exit; done
2828

2929
tests: all
30-
cd tests && (if [ -n "$(OBJDIR)" ]; then $(MAKE) OBJDIR="$(OBJDIR)tests/" "$(OBJDIR)tests/clint.log" "$(OBJDIR)tests/fixme.log" "$(OBJDIR)tests/pylint.log" "$(OBJDIR)tests/tests.log"; else $(MAKE) clint.log fixme.log pylint.log tests.log; fi)
30+
cd tests && (if [ -n "$(OBJDIR)" ]; then $(MAKE) OBJDIR="$(OBJDIR)tests/" "$(OBJDIR)tests/clint.log" "$(OBJDIR)tests/fixme.log" "$(OBJDIR)tests/pkgconfig.log" "$(OBJDIR)tests/pylint.log" "$(OBJDIR)tests/tests.log"; else $(MAKE) clint.log fixme.log pkgconfig.log pylint.log tests.log; fi)
3131

3232
clean:
3333
@for i in $(SUBDIRS); do (cd "$$i" && \

tests/Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
TARGETS = $(OBJDIR)array$(EXEEXT) $(OBJDIR)buffer$(EXEEXT) $(OBJDIR)clint.log $(OBJDIR)config$(EXEEXT) $(OBJDIR)coverage.log $(OBJDIR)error$(EXEEXT) $(OBJDIR)event$(EXEEXT) $(OBJDIR)fixme.log $(OBJDIR)includes$(EXEEXT) $(OBJDIR)parser$(EXEEXT) $(OBJDIR)pylint.log $(OBJDIR)string$(EXEEXT) $(OBJDIR)variable$(EXEEXT) $(OBJDIR)tests.log
1+
TARGETS = $(OBJDIR)array$(EXEEXT) $(OBJDIR)buffer$(EXEEXT) $(OBJDIR)clint.log $(OBJDIR)config$(EXEEXT) $(OBJDIR)coverage.log $(OBJDIR)error$(EXEEXT) $(OBJDIR)event$(EXEEXT) $(OBJDIR)fixme.log $(OBJDIR)includes$(EXEEXT) $(OBJDIR)parser$(EXEEXT) $(OBJDIR)pkgconfig.log $(OBJDIR)pylint.log $(OBJDIR)string$(EXEEXT) $(OBJDIR)variable$(EXEEXT) $(OBJDIR)tests.log
22
OBJDIR =
33
PREFIX = /usr/local
44
DESTDIR =
@@ -78,6 +78,9 @@ parser_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
7878
$(OBJDIR)parser$(EXEEXT): $(parser_OBJS)
7979
$(CC) -o $(OBJDIR)parser$(EXEEXT) $(parser_OBJS) $(parser_LDFLAGS)
8080

81+
$(OBJDIR)pkgconfig.log: $(OBJDIR)../data/libSystem.pc pkgconfig.sh
82+
./pkgconfig.sh -P "$(PREFIX)" -- "$(OBJDIR)pkgconfig.log"
83+
8184
$(OBJDIR)pylint.log: ../src/python/libSystem.py pylint.sh
8285
./pylint.sh -P "$(PREFIX)" -- "$(OBJDIR)pylint.log"
8386

@@ -95,7 +98,7 @@ variable_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
9598
$(OBJDIR)variable$(EXEEXT): $(variable_OBJS)
9699
$(CC) -o $(OBJDIR)variable$(EXEEXT) $(variable_OBJS) $(variable_LDFLAGS)
97100

98-
$(OBJDIR)tests.log: $(OBJDIR)array$(EXEEXT) $(OBJDIR)buffer$(EXEEXT) $(OBJDIR)config$(EXEEXT) config.conf config-noeol.conf $(OBJDIR)error$(EXEEXT) $(OBJDIR)event$(EXEEXT) $(OBJDIR)includes$(EXEEXT) $(OBJDIR)parser$(EXEEXT) pkgconfig.sh python.sh $(OBJDIR)string$(EXEEXT) tests.sh $(OBJDIR)variable$(EXEEXT) $(OBJDIR)../src/libSystem.a ../src/python/libSystem.c
101+
$(OBJDIR)tests.log: $(OBJDIR)array$(EXEEXT) $(OBJDIR)buffer$(EXEEXT) $(OBJDIR)config$(EXEEXT) config.conf config-noeol.conf $(OBJDIR)error$(EXEEXT) $(OBJDIR)event$(EXEEXT) $(OBJDIR)includes$(EXEEXT) $(OBJDIR)parser$(EXEEXT) python.sh $(OBJDIR)string$(EXEEXT) tests.sh $(OBJDIR)variable$(EXEEXT) $(OBJDIR)../src/libSystem.a ../src/python/libSystem.c
99102
./tests.sh -P "$(PREFIX)" -- "$(OBJDIR)tests.log"
100103

101104
$(OBJDIR)array.o: array.c ../src/array.c
@@ -130,6 +133,7 @@ clean:
130133
./clint.sh -c -P "$(PREFIX)" -O CPPFLAGS="-I$(DESTDIR)$(PREFIX)/include -I../include `pkg-config --cflags python-2.7`" -- "$(OBJDIR)clint.log"
131134
./coverage.sh -c -P "$(PREFIX)" -- "$(OBJDIR)coverage.log"
132135
./fixme.sh -c -P "$(PREFIX)" -- "$(OBJDIR)fixme.log"
136+
./pkgconfig.sh -c -P "$(PREFIX)" -- "$(OBJDIR)pkgconfig.log"
133137
./pylint.sh -c -P "$(PREFIX)" -- "$(OBJDIR)pylint.log"
134138
./tests.sh -c -P "$(PREFIX)" -- "$(OBJDIR)tests.log"
135139

0 commit comments

Comments
 (0)