Skip to content
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.

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

Makefile fixes and cleanup #664

Merged
merged 2 commits into from
Sep 30, 2015
Merged

Conversation

ploxiln
Copy link
Member

@ploxiln ploxiln commented Sep 30, 2015

EXAMPLES var is obsolete since 6813a90
BINARIES var is obsolete since 7e81199
The $(abspath ...) in the build recipe is obsolete since f648107
The install target intended to depend upon all the stuff being built, but since the variables changed, it no longer did. With this, you can once again build and install in one go.

before:

$ make PREFIX=$HOME install
install -m 755 -d /Users/pierce/bin
install -m 755 build/apps/nsqlookupd /Users/pierce/bin/nsqlookupd
install: build/apps/nsqlookupd: No such file or directory

after:

$ make PREFIX=$HOME install
go build  -o build/nsqd ./apps/nsqd
go build  -o build/nsqlookupd ./apps/nsqlookupd
go build  -o build/nsqadmin ./apps/nsqadmin
go build  -o build/nsq_pubsub ./apps/nsq_pubsub
go build  -o build/nsq_to_nsq ./apps/nsq_to_nsq
go build  -o build/nsq_to_file ./apps/nsq_to_file
go build  -o build/nsq_to_http ./apps/nsq_to_http
go build  -o build/nsq_tail ./apps/nsq_tail
go build  -o build/nsq_stat ./apps/nsq_stat
go build  -o build/to_nsq ./apps/to_nsq
install -m 755 -d /Users/pierce/bin
install -m 755 build/nsqlookupd  /Users/pierce/bin/nsqlookupd
install -m 755 build/nsqd        /Users/pierce/bin/nsqd
install -m 755 build/nsqadmin    /Users/pierce/bin/nsqadmin
install -m 755 build/nsq_pubsub  /Users/pierce/bin/nsq_pubsub
install -m 755 build/nsq_to_nsq  /Users/pierce/bin/nsq_to_nsq
install -m 755 build/nsq_to_file /Users/pierce/bin/nsq_to_file
install -m 755 build/nsq_to_http /Users/pierce/bin/nsq_to_http
install -m 755 build/nsq_tail    /Users/pierce/bin/nsq_tail
install -m 755 build/nsq_stat    /Users/pierce/bin/nsq_stat
install -m 755 build/to_nsq      /Users/pierce/bin/to_nsq

And finally, apps/ isn't needed in the build folder or all over the Makefile anymore.

@mreiferson
Copy link
Member

nice, thanks plo

mreiferson added a commit that referenced this pull request Sep 30, 2015
@mreiferson mreiferson merged commit 41ccf8a into nsqio:master Sep 30, 2015
@ploxiln ploxiln deleted the makefile_cleanup_2015 branch April 22, 2016 22:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants