Skip to content

Ibsim run install fix #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rleon merged 2 commits into from
May 18, 2020
Merged

Ibsim run install fix #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33db202
install: missing ) and ; for the install target
tzafrir-mellanox May 16, 2020
a961e90
Makefiles: avoid target override warning
tzafrir-mellanox May 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions defs.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ all:
%.so:
$(CC) -shared $(LDFLAGS) -o $@ $^ $(LIBS)

$(progs): %:
$(bins): %:
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)

dep:
Expand All @@ -57,8 +57,8 @@ clean:
install: all
install -d $(DESTDIR)$(binpath)
install -d $(DESTDIR)$(libdir)
$(foreach p, $(progs), install $(p) $(DESTDIR)$(binpath))
$(foreach l, $(libs), install $(l) $(DESTDIR)$(libdir)
$(foreach p, $(progs), install $(p) $(DESTDIR)$(binpath);)
$(foreach l, $(libs), install $(l) $(DESTDIR)$(libdir);)

$(objs): .build_profile
.build_profile::
Expand Down
4 changes: 3 additions & 1 deletion ibsim/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
progs:=ibsim ibsim-run
bins:=ibsim
scripts:=ibsim-run
progs:=$(bins) $(scrips)

-include ../defs.mk

Expand Down
6 changes: 3 additions & 3 deletions tests/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
progs:= subnet_discover query_many mcast_storm
bins:= subnet_discover query_many mcast_storm

-include ../defs.mk

all: $(progs)
all: $(bins)

$(progs): %: %.o
$(bins): %: %.o