From 7c9dee39e6acfa3b70cd95c829cccf186542a963 Mon Sep 17 00:00:00 2001
From: hooper114 <hooper114>
Date: Thu, 4 Mar 2010 07:38:47 +0000
Subject: [PATCH] Re-adjustment of Makefiles

---
 backend/Makefile      |  4 ++--
 backend/Makefile.bsd  | 54 -------------------------------------------
 frontend/Makefile     |  4 ++--
 frontend/Makefile.bsd | 31 -------------------------
 4 files changed, 4 insertions(+), 89 deletions(-)
 delete mode 100644 backend/Makefile.bsd
 delete mode 100644 frontend/Makefile.bsd

diff --git a/backend/Makefile b/backend/Makefile
index 7a2d30bd..d8003dfc 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -10,10 +10,10 @@ ZINT_VERSION:=-DZINT_VERSION=\"2.3.1\"
 
 
 CC := gcc
-INCLUDE := -I/usr/local/include
+INCLUDE := -I/usr/include
 CFLAGS := -g
 
-prefix := /usr/local
+prefix := /usr
 includedir := $(prefix)/include
 libdir := $(prefix)/lib
 DESTDIR :=
diff --git a/backend/Makefile.bsd b/backend/Makefile.bsd
deleted file mode 100644
index 2c501dfc..00000000
--- a/backend/Makefile.bsd
+++ /dev/null
@@ -1,54 +0,0 @@
-# Linux makefile for libzint
-#
-# make			compiles
-# make install		copies to /usr/lib
-# make uninstall	removes library
-# make clean		cleans up a previous compilation and any object or editor files
-#
-
-ZINT_VERSION:=-DZINT_VERSION=\"2.3.1\"
-
-
-CC := gcc
-INCLUDE := -I/usr/include
-CFLAGS := -g
-
-prefix := /usr
-includedir := $(prefix)/include
-libdir := $(prefix)/lib
-DESTDIR :=
-
-COMMON:= common.c png.c library.c ps.c large.c reedsol.c gs1.c svg.c
-COMMON_OBJ:= common.o png.o library.o ps.o large.o reedsol.o gs1.o svg.o
-ONEDIM:= code.c code128.c 2of5.c upcean.c telepen.c medical.c plessey.c rss.c
-ONEDIM_OBJ:= code.o code128.o 2of5.o upcean.o telepen.o medical.o plessey.o rss.o
-POSTAL:= postal.c auspost.c imail.c
-POSTAL_OBJ:= postal.o auspost.o imail.o
-TWODIM:= code16k.c dmatrix.c dm200.c pdf417.c qr.c maxicode.c composite.c aztec.c code49.c code1.c gridmtx.c
-TWODIM_OBJ:= code16k.o dmatrix.o dm200.o pdf417.o qr.o maxicode.o composite.o aztec.o code49.o code1.o gridmtx.o
-LIBS:= `libpng12-config --I_opts --L_opts --ldflags` -lz -lm
- 
-libzint: code.c code128.c 2of5.c upcean.c medical.c telepen.c plessey.c postal.c auspost.c imail.c code16k.c dmatrix.c dm200.c reedsol.c pdf417.c maxicode.c rss.c common.c png.c library.c ps.c qr.c large.c composite.c aztec.c gs1.c svg.c code49.c code1.c gridmtx.c
-	$(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(ONEDIM)
-	$(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(POSTAL)
-	$(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(TWODIM)
-	$(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(COMMON)
-	$(CC) $(CFLAGS) $(ZINT_VERSION) -shared -Wl,-soname,libzint.so -o libzint.so.2.3.1 $(INCLUDE) $(COMMON_OBJ) $(ONEDIM_OBJ) $(TWODIM_OBJ) $(POSTAL_OBJ) $(LIBS)
-	ln -s libzint.so.* libzint.so
-
-.PHONY: install uninstall clean dist
-
-install:
-	test "$(UID)" = "0" && ldconfig -n $(PWD) || true
-	install -d $(DESTDIR)$(libdir)
-	mv libzint.* $(DESTDIR)$(libdir)
-	install -D -p --mode=0644 zint.h $(DESTDIR)$(includedir)/zint.h
-
-uninstall:
-	rm $(DESTDIR)$(libdir)/libzint.*
-	rm $(DESTDIR)$(includedir)/zint.h
-
-clean:
-	rm -f libzint.* *.o *.a *~
-
-
diff --git a/frontend/Makefile b/frontend/Makefile
index 4a8882df..fed3d62c 100644
--- a/frontend/Makefile
+++ b/frontend/Makefile
@@ -9,10 +9,10 @@
 ZINT_VERSION:=-DZINT_VERSION=\"2.3.1\"
 
 CC := gcc
-INCLUDE := -I/usr/local/include
+INCLUDE := -I/usr/include
 CFLAGS := -g
 
-prefix := /usr/local
+prefix := /usr
 bindir := $(prefix)/bin
 DESTDIR :=
 
diff --git a/frontend/Makefile.bsd b/frontend/Makefile.bsd
deleted file mode 100644
index cf0131ae..00000000
--- a/frontend/Makefile.bsd
+++ /dev/null
@@ -1,31 +0,0 @@
-# Linux makefile for zint - requires libzint
-#
-# make			compiles zint
-# make install		copies binary to /usr/bin
-# make uninstall	removes the binary
-# make clean		cleans up a previous compilation and any object or editor files
-#
-
-ZINT_VERSION:=-DZINT_VERSION=\"2.3.1\"
-
-CC := gcc
-INCLUDE := -I/usr/include
-CFLAGS := -g
-
-prefix := /usr
-bindir := $(prefix)/bin
-DESTDIR :=
-
-zint: main.c
-	$(CC) -Wall $(INCLUDE) $(CFLAGS) $(ZINT_VERSION) -I../backend -L../backend main.c -o zint -lzint
-
-.PHONY: install uninstall clean dist
-
-clean:
-	rm -f zint *.o *.a *~ *.png *.eps *.svg *.log
-
-install:
-	install -D -p  zint $(DESTDIR)$(bindir)/zint
-
-uninstall:
-	rm $(DESTDIR)$(bindir)/zint