Merge branch 'getopt-bindings'

Makefile

@@ -50,9 +50,12 @@ install: dist
 	cp -r $(DESTDIR)/* /
 
 .PHONY: test
-test: build
+test: build /tmp/getopt
+	/tmp/getopt
 	tests/posix-compat.sh
-	$(RUSTC) --test src/getopt-rs/lib.rs -o build/test/getopt
+
+/tmp/getopt: src/libgetopt.rs
+	$(RUSTC) --test -o /tmp/getopt src/libgetopt.rs
 
 .PHONY: docs
 docs: docs/ build
@@ -65,13 +68,13 @@ docs: docs/ build
 rustlibs: build/o/libsysexits.rlib build/o/libgetopt.rlib \
 	build/o/libstrerror.rlib
 
-build/o/libgetopt.rlib: build src/getopt-rs/lib.rs
+build/o/libgetopt.rlib: build src/libgetopt.rs
 	$(RUSTC) $(RUSTFLAGS) --crate-type=lib --crate-name=getopt \
-		-o $@ src/getopt-rs/lib.rs
+		-o $@ src/libgetopt.rs
 
-build/o/libstrerror.rlib: build src/strerror.rs
+build/o/libstrerror.rlib: build src/libstrerror.rs
 	$(RUSTC) $(RUSTFLAGS) --crate-type=lib -o $@ \
-		src/strerror.rs
+		src/libstrerror.rs
 
 # bandage solution until bindgen(1) gets stdin support
 build/o/libsysexits.rlib: build $(SYSEXITS)sysexits.h
@@ -137,10 +140,8 @@ build/bin/strcmp: src/strcmp.c build
 
 .PHONY: swab
 swab: build/bin/swab
-build/bin/swab: src/swab.rs build build/o/libsysexits.rlib
-	$(RUSTC) $(RUSTFLAGS) --extern getopt=build/o/libgetopt.rlib \
-		--extern sysexits=build/o/libsysexits.rlib \
-		-o $@ src/swab.rs
+build/bin/swab: src/swab.rs build rustlibs
+	$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) -o $@ src/swab.rs
 
 .PHONY: true
 true: build/bin/true