Merge pull request #1 from teythoon/feature-cleanups

Feature cleanups

Author: oleksii-leonov

Makefile

@@ -2,60 +2,49 @@
 # Verona, August 2007 -- Massimo Del Fedele
 # Adapted from Samsung ML-85P driver by Rildo Pragana
 
-CC=gcc
-CFLAGS=-O2 -s -Wall
-RELEASE=0.1.2
+CFLAGS ?= -O3 -Wall
 
-all: lbp800 parcapt
+TARGETS=lbp800 parcapt
 
-lbp800: \
+HEADERS=\
     machine.h \
-    errcapt.c errcapt.h \
-    bmcapt.c bmcapt.h \
-    lbp800.c lbp800.h \
-    Makefile
-	${CC} ${INCLUDE} ${CFLAGS} \
-	errcapt.c bmcapt.c lbp800.c \
-	-l cups -o bin/Release/lbp800
-
-parcapt: \
-    machine.h \
-    errcapt.c errcapt.h \
-    pport.c pport.h \
-    timcapt.c timcapt.h \
-    llcapt.c llcapt.h \
-    pkcapt.c pkcapt.h \
-    hlcapt.c hlcapt.h \
-  	parcapt.h \
-	  parcapt.c \
-	  Makefile
-	${CC} ${INCLUDE} ${CFLAGS} \
-	errcapt.c pport.c timcapt.c llcapt.c pkcapt.c hlcapt.c parcapt.c \
-	-l cups -o bin/Release/parcapt
+    errcapt.h \
+    bmcapt.h \
+    lbp800.h \
+    pport.h \
+    timcapt.h \
+    llcapt.h \
+    pkcapt.h \
+    hlcapt.h \
+    parcapt.h \
+
+
+.PHONY: all
+all: $(TARGETS)
+
+lbp800: errcapt.o bmcapt.o lbp800.o
+
+parcapt: errcapt.o pport.o timcapt.o llcapt.o pkcapt.o hlcapt.o parcapt.o
 
+%.o: %.c $(HEADERS)
+	$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
 
+.PHONY: install
 install: all
-	install -s -m a=rx bin/Release/lbp800 /usr/bin
+	install -m a=rx lbp800 /usr/bin
 	install -m a=rx lbp800-print /usr/bin
 	install -m a=r ppd/Canon-LBP-800.ppd /usr/share/ppd/custom
 	install -m a=rx foo2lbp800-wrapper /usr/bin
-	install -m a=rx bin/Release/parcapt /usr/lib/cups/backend
+	install -m a=rx parcapt /usr/lib/cups/backend
 
+.PHONY: uninstall
 uninstall:
-	rm -f /usr/bin/lbp800
-	rm -f /usr/bin/lbp800-print
-	rm -f /usr/share/ppd/custom/Canon-LBP-800.ppd
-	rm -f /usr/bin/foo2lbp800-wrapper
-	rm -f /usr/lib/cups/backend/parcapt
+	rm -f -- /usr/bin/lbp800
+	rm -f -- /usr/bin/lbp800-print
+	rm -f -- /usr/share/ppd/custom/Canon-LBP-800.ppd
+	rm -f -- /usr/bin/foo2lbp800-wrapper
+	rm -f -- /usr/lib/cups/backend/parcapt
 
+.PHONY: clean
 clean:
-	rm -f obj/Debug/*
-	rm -f obj/Release/*
-	rm -f bin/Release/lbp800 bin/Release/parcapt
-	rm -f bin/Debug/lbp800 bin/Debug/parcapt
-
-package: clean
-	rm -f *~ ppd/*~
-	cp -a ../lbp800 ../lbp800-${RELEASE}
-	tar cvfz ../lbp800-${RELEASE}.tar.gz ../lbp800-${RELEASE}
-	rm -rf ../lbp800-${RELEASE}
+	rm -f -- $(TARGETS) *.o

bin/Debug/.gitkeep

@@ -18,13 +18,6 @@
 #*
 #* Authors: Massimo Del Fedele <max@veneto.com>
 
-echo "CMDLINE : $@\n\n" > /tmp/pippo-filter-1.txt
-#cat > /tmp/pippo-filter-2.txt
-#return 0;
-#gs -q -dNOPAUSE -dPARANOIDSAFER -dBATCH -r600x600 -sPAPERSIZE=a4 -sDEVICE=pbmraw -sOutputFile=- -
-#   1> /tmp/capt.log 2>&1
-gs -q -dNOPAUSE -dPARANOIDSAFER -dBATCH -r600x600 -sDEVICE=pbmraw -sOutputFile="|lbp800 -t 110 -l 110" -
-#   1> /tmp/capt.log 2>&1
-
-
-return 0;
+gs -q -dNOPAUSE -dPARANOIDSAFER -dBATCH -r600x600 -sDEVICE=pbmraw \
+    -sOutputFile=- - \
+    | lbp800 -t 110 -l 110

bin/Release/.gitkeep

@@ -37,7 +37,7 @@
 // PROGRAMMA PRINCIPALE
 int main(int argc, char** argv)
 {
-  char c;
+  int c;
   fprintf(stderr,"lbp800:main is here\n");
   // BITMAP SORGENTE
   TSourceBitmap Bitmap;
@@ -76,6 +76,10 @@ int main(int argc, char** argv)
         }
         break;
 
+      default:
+        fprintf(stderr, "Usage: %s [-t topskip] [-l leftskip] [-f file]\n",
+                argv[0]);
+        exit(EXIT_FAILURE);
     } // END switch()
   } // END while
 

foo2lbp800-wrapper

@@ -49,7 +49,7 @@ inline int Parport_Open(char *DeviceName)
   Device = open (DeviceName, O_RDWR);
 //    Device = open (DeviceName, O_RDWR|O_EXCL);
   if(Device == -1){
-    fprintf(stderr, "DEBUG - pport:Parport_Open Can not open %s \n",DeviceName);
+    fprintf(stderr, "ERROR: Parport_Open Can not open %s\n", DeviceName);
     return Device;
   }
 //    sleep(2);
@@ -66,13 +66,13 @@ inline int Parport_Open(char *DeviceName)
 
   if (ioctl (Device, PPCLAIM))
   {
-   fprintf(stderr, "DEBUG - pport:Parport_Open Can not claim\n");
+    perror("ERROR: Parport_Open Can not claim");
     close (Device);
     return -1;
   }
 
    ioctl (Device, PPGETMODE, &bCurrentPortMode);
-    fprintf(stderr, "DEBUG - pport:Parport_Open PPGETMODE  %04Xh\n",(int)bCurrentPortMode);
+    fprintf(stderr, "ERROR: Parport_Open PPGETMODE %04Xh\n", (int) bCurrentPortMode);
 
   return Device;