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

diff --git a/contrib/objcwrapper/Makefile b/contrib/objcwrapper/Makefile
index 3f39029..e248fb1 100644
--- a/contrib/objcwrapper/Makefile
+++ b/contrib/objcwrapper/Makefile
@@ -23,20 +23,17 @@ check: bin/objc_test_parser bin/objcwrapper
 	../../bin/nitpick tests/MyClass.nit
 
 # Test on classes of libgnustep-base-dev
-check-gnustep:
-	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
-	../../bin/nitpick NSArray.nit
+check-gnustep: bin/objcwrapper
+	bin/objcwrapper /usr/include/GNUstep/Foundation/*.h -o tests/gnustep.nit -p "-I /usr/include/GNUstep/ -Wno-deprecated -Wno-cpp"
+	../../bin/nitpick tests/nsarray.nit
 
 # Test on classes of the Apple Foundation framework
-check-apple:
-	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
-	../../bin/nitpick NSArray.nit
-
-bin/header_static:
+check-apple: bin/objcwrapper
+	bin/objcwrapper /System/Library/Frameworks/Foundation.framework/Versions/C/Headers/NSArray.h -o tests/nsarray.nit
+	../../bin/nitpick tests/nsarray.nit
+
+	bin/objcwrapper /System/Library/Frameworks/AppKit.framework/Headers/NSAlert.h -o tests/nsalert.nit
+	../../bin/nitpick tests/nsalert.nit
+
+bin/header_static: $(shell ../../bin/nitls -M src/header_static.nit)
 	../../bin/nitc --dir bin src/header_static.nit