Merge lp:~sforshee/oif/ntrig-calibrator into lp:~oif-team/oif/ntrig-calibrator

Proposed by Seth Forshee
Status: Merged
Merged at revision: 2
Proposed branch: lp:~sforshee/oif/ntrig-calibrator
Merge into: lp:~oif-team/oif/ntrig-calibrator
Diff against target: 9 lines (+1/-1)
1 file modified
Makefile (+1/-1)
To merge this branch: bzr merge lp:~sforshee/oif/ntrig-calibrator
Reviewer Review Type Date Requested Status
Chase Douglas (community) Approve
Review via email: mp+48180@code.launchpad.net

Description of the change

Change link order of objects to fix build error.

Test case: Before change running calib.sh fails with link errors from build. After change it works fine.

To post a comment you must log in.
Revision history for this message
Chase Douglas (chasedouglas) wrote :

Works for me. Thanks!

review: Approve
Revision history for this message
Duncan McGreggor (oubiwann) wrote :

Thanks for the contribution, Seth!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2010-08-25 16:45:34 +0000
3+++ Makefile 2011-02-01 15:33:16 +0000
4@@ -1,4 +1,4 @@
5 all: calib firmware mode
6
7 mode calib firmware: %: %.c
8- gcc -lusb -o $@ $<
9+ gcc -o $@ $< -lusb

Subscribers

People subscribed via source and target branches