Commits

Alex Hixon committed 7a9863b

Add the 'rules' Makefile rule to be a dependency of 'all' - basically, generate udev rules when running 'make'.

Comments (0)

Files changed (2)

 .c.o:
 	$(CC) -g -Wall -DHAVE_CONFIG_H -DUCODE_PATH=\"$(UCODE_PATH)\" $(CFLAGS) $(INCS) -c $*.c $*.h
 
-all: loader
+all: loader rules
 
 loader: loader.o
 	$(CC) -g -Wall $(CFLAGS) -o $@ loader.o $(LIBS)
 	$ sudo apt-get install libglib2.0-dev libusb-dev build-essential gcc automake mercurial
 	$ hg clone http://bitbucket.org/ahixon/r5u87x/
 	$ cd r5u87x
-	$ make; make rules
+	$ make
 	$ sudo make install
 	$ sudo r5u87x-loader --reload
 	
 
 Simply install the dependencies required above on your system, then run
 'make'.
-
-If you'd like your system to automatically load the firmware to the camera,
-and then reload the uvcvideo module at boot time, simply run:
- $ make rules
  
 Now you can proceed to installing the tool system-wide:
  # make install
+
+If you have udev installed, your system will automatically load the firmware
+to the camera, and then reload the uvcvideo module at boot time.
  
 Please note that the loader is installed system-wide as 'r5u87x-loader', but
 compiles as just 'loader'.
 
+You can either reboot or follow the instructions below.
+
 Usage
 =====
 
-To upload the firmware to your camera, simply run (possibly as root, depending
-on your system):
-  # loader
+To upload the firmware to your camera, simply run (as root):
+  # loader --reload
 
 Do note that this only lasts while the camera still has power to it. Shutting
 down and starting up again will cause the camera to lose its state. Rebooting,
 however, won't.
 
-You may need to reload your kernel module (eg. uvcvideo) for it to notice your
-camera now that it has firmware. You can either get the loader tool to do this
-when it's finished:
-  # loader --reload
-
-at boot time, by following the instructions above (see Installation), or by
-performing it manually:
-  # modprobe -r uvcvideo; modprobe uvcvideo
-
 If your camera appears to be playing up, you can try forcefully resetting it:
   # loader --force-clear
 
-There are also useful arguments for testing, see doc/extracting_ucode.txt
+There are also useful arguments for testing, see docs/extracting_ucode.txt
 
 Bugs
 ====