From ce6eac07d857560f71eb83b96444c133c6fa93f2 Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Tue, 17 Sep 2024 15:56:49 +0200 Subject: [PATCH] clean up Makefile, move files to top-dir. --- .gitignore | 3 + makefile => Makefile | 34 ++- ...bufferedscanlines.c => bufferedscanlines.c | 0 ...bufferedscanlines.h => bufferedscanlines.h | 0 ppd/EpsonTMT20Simple.ppd~ | 211 ------------------ ...ertoepsonsimple.c => rastertoepsonsimple.c | 0 6 files changed, 16 insertions(+), 232 deletions(-) rename makefile => Makefile (63%) rename src/bufferedscanlines.c => bufferedscanlines.c (100%) rename src/bufferedscanlines.h => bufferedscanlines.h (100%) delete mode 100644 ppd/EpsonTMT20Simple.ppd~ rename src/rastertoepsonsimple.c => rastertoepsonsimple.c (100%) diff --git a/.gitignore b/.gitignore index 1377554..502e51c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ *.swp +*.o +/bin +/rastertoepsonsimple diff --git a/makefile b/Makefile similarity index 63% rename from makefile rename to Makefile index 0b83002..1f43f40 100644 --- a/makefile +++ b/Makefile @@ -10,18 +10,11 @@ DEFS=-DRPMBUILD LIBS=-ldl endif -define dependencies -@if [ ! -e /usr/include/cups ]; then echo "CUPS headers not available - exiting"; exit 1; fi -endef +all: rastertoepsonsimple $(ppds) +.PHONY: all -define init -@if [ ! -e bin ]; then echo "mkdir bin"; mkdir bin; fi -endef - -define sweep -@if [ -e bin ]; then echo "rm -f bin/*"; rm -f bin/*; rmdir bin; fi -@if [ -e install ]; then echo "rm -f install/*"; rm -f install/*; rmdir install; fi -endef +bin: + mkdir -p bin install/setup: rastertoepsonsimple $(ppds) setup # packaging @@ -40,8 +33,8 @@ install: .PHONY: remove remove: #removing from default location (other locations require manual removal) - @if [ -e /usr/lib/cups/filter/rastertoepsonsimple ]; then echo "Removing rastertoepsonsimple"; rm -f /usr/lib/cups/filter/rastertoepsonsimple; fi - @if [ -d /usr/share/cups/model/star ]; then echo "Removing dir .../cups/model/star"; rm -rf /usr/share/cups/model/star; fi + rm -f /usr/lib/cups/filter/rastertoepsonsimple + rm -rf /usr/share/cups/model/star .PHONY: rpmbuild rpmbuild: @@ -60,12 +53,13 @@ help: # make remove removes installed files from your system (assumes default install lication) [requires root user permissions] # make clean deletes all compiles files and their folders -rastertoepsonsimple: rastertoepsonsimple.c bufferedscanlines.o - $(dependencies) - $(init) - # compiling rastertoepsonsimple filter - gcc -Wl,-rpath,/usr/lib -Wall -fPIC -O2 $(DEFS) -o bin/rastertoepsonsimple bufferedscanlines.o src/rastertoepsonsimple.c $(LIBS) +%.o: %.c + gcc -Wall -fPIC -O2 $(DEFS) -c -o $@ $^ +rastertoepsonsimple: rastertoepsonsimple.o bufferedscanlines.o + # compiling rastertoepsonsimple filter + ld $(NIX_LDFLAGS) $(DEFS) -o $@ $^ -lc $(LIBS) + #gcc $(DEFS) -o $@ $< $(LIBS) $(ppds): %.ppd.gz: %.ppd # gzip ppd file @@ -80,6 +74,4 @@ setup: setup.sh .PHONY: clean clean: - # cleaning - $(sweep) - + rm -f *.o bin/* install/* rastertoepsonsimple diff --git a/src/bufferedscanlines.c b/bufferedscanlines.c similarity index 100% rename from src/bufferedscanlines.c rename to bufferedscanlines.c diff --git a/src/bufferedscanlines.h b/bufferedscanlines.h similarity index 100% rename from src/bufferedscanlines.h rename to bufferedscanlines.h diff --git a/ppd/EpsonTMT20Simple.ppd~ b/ppd/EpsonTMT20Simple.ppd~ deleted file mode 100644 index 70f217e..0000000 --- a/ppd/EpsonTMT20Simple.ppd~ +++ /dev/null @@ -1,211 +0,0 @@ -*PPD-Adobe: "4.3" -*FormatVersion: "4.3" -*FileVersion: "2.0" -*LanguageVersion: English -*LanguageEncoding: ISOLatin1 -*PCFileName: "EpsonTMT20Simple.ppd" -*Manufacturer: "Epson" -*Product: "(TM-T20)" -*1284DeviceID: "MFG:Epson;CMD:Epson;MDL:TMT20;CLS:PRINTER;" -*cupsVersion: 1.1 -*cupsManualCopies: True -*cupsModelNumber: 20 -*cupsFilter: "application/vnd.cups-raster 0 rastertoepsonsimple" -*ModelName: "TM-T20" -*ShortNickName: "TM-T20" -*NickName: "Epson TM-T20" -*PSVersion: "(3010.000) 550" -*LanguageLevel: "3" -*ColorDevice: False -*DefaultColorSpace: Gray -*FileSystem: False -*Throughput: "1" -*LandscapeOrientation: Plus90 -*VariablePaperSize: True -*TTRasterizer: Type42 -*cupsSNMPSupplies: False -*cupsIPPReason com.star-paper_out_error/Printer is out of paper: "" - -*OpenUI *PageSize/Media Size: PickOne -*OrderDependency: 10 AnySetup *PageSize -*DefaultPageSize: X80MMY200MM - -*%PageSize Custom/Custom: "<>setpagedevice" - -*% 50.8mm wide page size note -*% 50.8mm = 2.0in * 72 = 144 points -*% use 143 points to cause 5.0 point difference with 52.5mm paper and help CUPS matching algorithm -*% see CUPS src - gdevcups.c - search "find matching page size" -*PageSize X80MMY30MM/80mm * 30mm: "<>setpagedevice" -*PageSize X80MMY40MM/80mm * 40mm: "<>setpagedevice" -*PageSize X80MMY50MM/80mm * 50mm: "<>setpagedevice" -*PageSize X80MMY60MM/80mm * 60mm: "<>setpagedevice" -*PageSize X80MMY70MM/80mm * 70mm: "<>setpagedevice" -*PageSize X80MMY80MM/80mm * 80mm: "<>setpagedevice" -*PageSize X80MMY90MM/80mm * 90mm: "<>setpagedevice" -*PageSize X80MMY100MM/80mm * 100mm: "<>setpagedevice" -*PageSize X80MMY110MM/80mm * 110mm: "<>setpagedevice" -*PageSize X80MMY120MM/80mm * 120mm: "<>setpagedevice" -*PageSize X80MMY130MM/80mm * 130mm: "<>setpagedevice" -*PageSize X80MMY140MM/80mm * 140mm: "<>setpagedevice" -*PageSize X80MMY150MM/80mm * 150mm: "<>setpagedevice" -*PageSize X80MMY160MM/80mm * 160mm: "<>setpagedevice" -*PageSize X80MMY170MM/80mm * 170mm: "<>setpagedevice" -*PageSize X80MMY180MM/80mm * 180mm: "<>setpagedevice" -*PageSize X80MMY190MM/80mm * 190mm: "<>setpagedevice" -*PageSize X80MMY200MM/80mm * 200mm: "<>setpagedevice" -*PageSize X80MMY1500MM/80mm * 1500mm: "<>setpagedevice" -*PageSize X80MMY2000MM/80mm * 2000mm: "<>setpagedevice" - -*% Zoom resolution calculation note -*% A4 real width = 209mm = 8.23in -*% Printer real width = 72mm = 576 dots -*% Printer real resolution = 203dpi -*% Rendering resolution = floor(576 dots / (8.23in * (1 - zoom))) -*% 69 = floor(576 / (8.23 * (1 - 0))) -*% 139 = floor(576 / (8.23 * (1 - .5))) - -*PageSize A4/A4 : "<>setpagedevice" -*PageSize Letter/Letter : "<>setpagedevice" -*PageSize Legal/Legal : "<>setpagedevice" -*CloseUI: *PageSize - -*OpenUI *PageRegion: PickOne -*OrderDependency: 10 AnySetup *PageRegion -*DefaultPageRegion: X80MMY200MM - -*%PageRegion Custom/Custom: "<>setpagedevice" - - -*PageRegion X80MMY30MM/80mm * 30mm: "<>setpagedevice" -*PageRegion X80MMY40MM/80mm * 40mm: "<>setpagedevice" -*PageRegion X80MMY50MM/80mm * 50mm: "<>setpagedevice" -*PageRegion X80MMY60MM/80mm * 60mm: "<>setpagedevice" -*PageRegion X80MMY70MM/80mm * 70mm: "<>setpagedevice" -*PageRegion X80MMY80MM/80mm * 80mm: "<>setpagedevice" -*PageRegion X80MMY90MM/80mm * 90mm: "<>setpagedevice" -*PageRegion X80MMY100MM/80mm * 100mm: "<>setpagedevice" -*PageRegion X80MMY110MM/80mm * 110mm: "<>setpagedevice" -*PageRegion X80MMY120MM/80mm * 120mm: "<>setpagedevice" -*PageRegion X80MMY130MM/80mm * 130mm: "<>setpagedevice" -*PageRegion X80MMY140MM/80mm * 140mm: "<>setpagedevice" -*PageRegion X80MMY150MM/80mm * 150mm: "<>setpagedevice" -*PageRegion X80MMY160MM/80mm * 160mm: "<>setpagedevice" -*PageRegion X80MMY170MM/80mm * 170mm: "<>setpagedevice" -*PageRegion X80MMY180MM/80mm * 180mm: "<>setpagedevice" -*PageRegion X80MMY190MM/80mm * 190mm: "<>setpagedevice" -*PageRegion X80MMY200MM/80mm * 200mm: "<>setpagedevice" -*PageRegion X80MMY1500MM/80mm * 1500mm: "<>setpagedevice" -*PageRegion X80MMY2000MM/80mm * 2000mm: "<>setpagedevice" - -*PageRegion A4/A4 : "<>setpagedevice" -*PageRegion Letter/Letter : "<>setpagedevice" -*PageRegion Legal/Legal : "<>setpagedevice" -*CloseUI: *PageRegion - -*DefaultImageableArea: X80MMY200MM - -*%ImageableArea Custom: "0.0 0.0 0.0 0.0" - -*ImageableArea X80MMY30MM: "0.0 0.0 226.0 85.0" -*ImageableArea X80MMY40MM: "0.0 0.0 226.0 113.0" -*ImageableArea X80MMY50MM: "0.0 0.0 226.0 141.0" -*ImageableArea X80MMY60MM: "0.0 0.0 226.0 170.0" -*ImageableArea X80MMY70MM: "0.0 0.0 226.0 198.0" -*ImageableArea X80MMY80MM: "0.0 0.0 226.0 226.0" -*ImageableArea X80MMY90MM: "0.0 0.0 226.0 255.0" -*ImageableArea X80MMY100MM: "0.0 0.0 226.0 283.0" -*ImageableArea X80MMY110MM: "0.0 0.0 226.0 311.0" -*ImageableArea X80MMY120MM: "0.0 0.0 226.0 340.0" -*ImageableArea X80MMY130MM: "0.0 0.0 226.0 368.0" -*ImageableArea X80MMY140MM: "0.0 0.0 226.0 396.0" -*ImageableArea X80MMY150MM: "0.0 0.0 226.0 425.0" -*ImageableArea X80MMY160MM: "0.0 0.0 226.0 453.0" -*ImageableArea X80MMY170MM: "0.0 0.0 226.0 481.0" -*ImageableArea X80MMY180MM: "0.0 0.0 226.0 510.0" -*ImageableArea X80MMY190MM: "0.0 0.0 226.0 538.0" -*ImageableArea X80MMY200MM: "0.0 0.0 226.0 566.0" -*ImageableArea X80MMY1500MM: "0.0 0.0 226.0 4251.0" -*ImageableArea X80MMY2000MM: "0.0 0.0 226.0 5668.0" - -*ImageableArea A4: "0.0 0.0 595.0 842.0" -*ImageableArea Letter: "0.0 0.0 612.0 792.0" -*ImageableArea Legal: "0.0 0.0 612.0 1008.0" - - -*DefaultPaperDimension: X80MMY200MM - -*%PaperDimension Custom: "0 0" - - -*PaperDimension X80MMY30MM: "226 85" -*PaperDimension X80MMY40MM: "226 113" -*PaperDimension X80MMY50MM: "226 141" -*PaperDimension X80MMY60MM: "226 170" -*PaperDimension X80MMY70MM: "226 198" -*PaperDimension X80MMY80MM: "226 226" -*PaperDimension X80MMY90MM: "226 255" -*PaperDimension X80MMY100MM: "226 283" -*PaperDimension X80MMY110MM: "226 311" -*PaperDimension X80MMY120MM: "226 340" -*PaperDimension X80MMY130MM: "226 368" -*PaperDimension X80MMY140MM: "226 396" -*PaperDimension X80MMY150MM: "226 425" -*PaperDimension X80MMY160MM: "226 453" -*PaperDimension X80MMY170MM: "226 481" -*PaperDimension X80MMY180MM: "226 510" -*PaperDimension X80MMY190MM: "226 538" -*PaperDimension X80MMY200MM: "226 566" -*PaperDimension X80MMY1500MM: "226 4251" -*PaperDimension X80MMY2000MM: "226 5668" - -*PaperDimension A4: "595 842" -*PaperDimension Letter: "612 792" -*PaperDimension Legal: "612 1008" - -*MaxMediaWidth: "226" -*MaxMediaHeight: "5670" -*HWMargins: 0 0 0 0 -*CustomPageSize True: "pop pop pop <>setpagedevice" -*ParamCustomPageSize Width: 1 points 72 226 -*ParamCustomPageSize Height: 2 points 72 5670 -*ParamCustomPageSize WidthOffset: 3 points 0 0 -*ParamCustomPageSize HeightOffset: 4 points 0 0 -*ParamCustomPageSize Orientation: 5 int 0 0 - -*OpenGroup: OutputGroup/Output Options -*OpenUI *PageType/3. Page Type: PickOne -*DefaultPageType: 0Variable -*PageType 0Variable/Variable Length: "" -*PageType 1Fixed/Fixed Length: "" -*CloseUI: *PageType - -*OpenUI *PixelDoublingType/4. Pixel Doubling: PickOne -*DefaultPixelDoublingType: 0NoDoubling -*PixelDoublingType 0NoDoubling/None: "" -*PixelDoublingType 1HorizontalDoubling/Double Width: "" -*PixelDoublingType 2VerticalDoubling/Double High: "" -*PixelDoublingType 3BothDoubling/Double Wide and High: "" -*CloseUI: *PixelDoublingType -*CloseGroup: OutputGroup - -*OpenGroup: CutGroup/Cut Options -*OpenUI *PageCutType/1. Page Cut Type: PickOne -*DefaultPageCutType: 0NoCutPage -*PageCutType 0NoCutPage/No Cut: "" -*PageCutType 1CutPage/Cut: "" -*CloseUI: *PageCutType - -*OpenUI *DocCutType/2. Document Cut Type: PickOne -*DefaultDocCutType: 1CutDoc -*DocCutType 0NoCutDoc/No Cut: "" -*DocCutType 1CutDoc/Cut: "" -*CloseUI: *DocCutType -*CloseGroup: CutGroup - - -*OpenGroup: DoublingGroup/Pixel Doubling -*CloseGroup: DoublingGroup - - -*% End diff --git a/src/rastertoepsonsimple.c b/rastertoepsonsimple.c similarity index 100% rename from src/rastertoepsonsimple.c rename to rastertoepsonsimple.c