X-Git-Url: http://nitlanguage.org

diff --git a/contrib/objcwrapper/Makefile b/contrib/objcwrapper/Makefile
index 34257ab..fe6fece 100644
--- a/contrib/objcwrapper/Makefile
+++ b/contrib/objcwrapper/Makefile
@@ -1,5 +1,7 @@
 all: bin/objcwrapper
 
+pre-build: src/objc_parser.nit
+
 ../nitcc/src/nitcc:
 	make -C ../nitcc
 
@@ -8,11 +10,11 @@ src/objc_parser.nit: ../nitcc/src/nitcc grammar/objc.sablecc
 	mv *.nit src/
 	mv objc* gen/
 
-bin/objcwrapper: $(shell ../../bin/nitls -M src/objcwrapper.nit) src/objc_parser.nit
-	../../bin/nitc -o bin/objcwrapper src/objcwrapper.nit --semi-global
+bin/objcwrapper: $(shell nitls -M src/objcwrapper.nit) src/objc_parser.nit
+	nitc -o bin/objcwrapper src/objcwrapper.nit --semi-global
 
-bin/objc_test_parser: $(shell ../../bin/nitls -M src/objc_test_parser.nit)
-	../../bin/nitc -o bin/objc_test_parser src/objc_test_parser.nit --semi-global
+bin/objc_test_parser: $(shell nitls -M src/objc_test_parser.nit)
+	nitc -o bin/objc_test_parser src/objc_test_parser.nit --semi-global
 
 check: bin/objc_test_parser bin/objcwrapper
 	# Test the parser
@@ -20,23 +22,20 @@ check: bin/objc_test_parser bin/objcwrapper
 
 	# Test objcwrapper
 	bin/objcwrapper tests/MyClass.h -o tests/MyClass.nit
-	../../bin/nitpick tests/MyClass.nit
+	nitpick tests/MyClass.nit
 
 # Test on classes of libgnustep-base-dev
 check-gnustep: bin/objcwrapper
-	gcc -E /usr/include/GNUstep/Foundation/NSArray.h -I /usr/include/GNUstep/ -Wno-deprecated \
-	| ../header_keeper/bin/header_keeper /usr/include/GNUstep/Foundation/NSArray.h \
-	| bin/header_static > tests/NSArray.pre.h
-	bin/objcwrapper tests/NSArray.pre.h -o tests/nsarray.nit
-	../../bin/nitpick tests/nsarray.nit
+	bin/objcwrapper /usr/include/GNUstep/Foundation/*.h -o tests/gnustep.nit -p "-I /usr/include/GNUstep/ -Wno-deprecated -Wno-cpp"
+	nitpick tests/nsarray.nit
 
 # Test on classes of the Apple Foundation framework
 check-apple: bin/objcwrapper
-	gcc -E /System/Library/Frameworks/Foundation.framework/Versions/C/Headers/NSArray.h \
-	| ../header_keeper/bin/header_keeper /System/Library/Frameworks/Foundation.framework/Versions/C/Headers/NSArray.h \
-	| bin/header_static > tests/NSArray.pre.h
-	bin/objcwrapper tests/NSArray.pre.h -o tests/nsarray.nit
-	../../bin/nitpick tests/nsarray.nit
-
-bin/header_static:
-	../../bin/nitc --dir bin src/header_static.nit
+	bin/objcwrapper /System/Library/Frameworks/Foundation.framework/Versions/C/Headers/NSArray.h -o tests/nsarray.nit
+	nitpick tests/nsarray.nit
+
+	bin/objcwrapper /System/Library/Frameworks/AppKit.framework/Headers/NSAlert.h -o tests/nsalert.nit
+	nitpick tests/nsalert.nit
+
+bin/header_static: $(shell nitls -M src/header_static.nit)
+	nitc --dir bin src/header_static.nit