Imported Upstream version 1.4.5

39 files changed, 9 insertions, 22 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 95cc49e..95cc49e 100644..100755
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 58a5dcc..7748821 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -68,12 +68,6 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 am__installdirs = "$(DESTDIR)$(libdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libescpr_la_LIBADD =
@@ -127,7 +121,6 @@ CUPS_PPD_DIR = @CUPS_PPD_DIR@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -152,7 +145,6 @@ LN_S = @LN_S@
 LSB_VER = @LSB_VER@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -180,7 +172,6 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -214,6 +205,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -342,7 +334,7 @@ clean-libLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libescpr.la: $(libescpr_la_OBJECTS) $(libescpr_la_DEPENDENCIES) $(EXTRA_libescpr_la_DEPENDENCIES) 
+libescpr.la: $(libescpr_la_OBJECTS) $(libescpr_la_DEPENDENCIES) 
 	$(libescpr_la_LINK) -rpath $(libdir) $(libescpr_la_OBJECTS) $(libescpr_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -598,15 +590,10 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
diff --git a/lib/epson-cbt.c b/lib/epson-cbt.c
index e65bd5c..e65bd5c 100644..100755
--- a/lib/epson-cbt.c
+++ b/lib/epson-cbt.c
diff --git a/lib/epson-cbt.h b/lib/epson-cbt.h
index 936ae02..936ae02 100644..100755
--- a/lib/epson-cbt.h
+++ b/lib/epson-cbt.h
diff --git a/lib/epson-escpage-color.c b/lib/epson-escpage-color.c
index c162739..c162739 100644..100755
--- a/lib/epson-escpage-color.c
+++ b/lib/epson-escpage-color.c
diff --git a/lib/epson-escpage-color.h b/lib/epson-escpage-color.h
index 50e5246..50e5246 100644..100755
--- a/lib/epson-escpage-color.h
+++ b/lib/epson-escpage-color.h
diff --git a/lib/epson-escpage-comp.c b/lib/epson-escpage-comp.c
index cb458ee..cb458ee 100644..100755
--- a/lib/epson-escpage-comp.c
+++ b/lib/epson-escpage-comp.c
diff --git a/lib/epson-escpage-comp.h b/lib/epson-escpage-comp.h
index 9036210..9036210 100644..100755
--- a/lib/epson-escpage-comp.h
+++ b/lib/epson-escpage-comp.h
diff --git a/lib/epson-escpage-mono.c b/lib/epson-escpage-mono.c
index beb9246..beb9246 100644..100755
--- a/lib/epson-escpage-mono.c
+++ b/lib/epson-escpage-mono.c
diff --git a/lib/epson-escpage-mono.h b/lib/epson-escpage-mono.h
index 50c7d20..50c7d20 100644..100755
--- a/lib/epson-escpage-mono.h
+++ b/lib/epson-escpage-mono.h
diff --git a/lib/epson-escpage.c b/lib/epson-escpage.c
index 1635192..1635192 100644..100755
--- a/lib/epson-escpage.c
+++ b/lib/epson-escpage.c
diff --git a/lib/epson-escpage.h b/lib/epson-escpage.h
index 4711c50..4711c50 100644..100755
--- a/lib/epson-escpage.h
+++ b/lib/epson-escpage.h
diff --git a/lib/epson-escpr-api.c b/lib/epson-escpr-api.c
index fb86525..fb86525 100644..100755
--- a/lib/epson-escpr-api.c
+++ b/lib/epson-escpr-api.c
diff --git a/lib/epson-escpr-api.h b/lib/epson-escpr-api.h
index 2811577..2811577 100644..100755
--- a/lib/epson-escpr-api.h
+++ b/lib/epson-escpr-api.h
diff --git a/lib/epson-escpr-dbg.c b/lib/epson-escpr-dbg.c
index 683f0aa..683f0aa 100644..100755
--- a/lib/epson-escpr-dbg.c
+++ b/lib/epson-escpr-dbg.c
diff --git a/lib/epson-escpr-dbg.h b/lib/epson-escpr-dbg.h
index 1dfa8d8..1dfa8d8 100644..100755
--- a/lib/epson-escpr-dbg.h
+++ b/lib/epson-escpr-dbg.h
diff --git a/lib/epson-escpr-def.h b/lib/epson-escpr-def.h
index 51a9800..51a9800 100644..100755
--- a/lib/epson-escpr-def.h
+++ b/lib/epson-escpr-def.h
diff --git a/lib/epson-escpr-err.h b/lib/epson-escpr-err.h
index f6e068c..f6e068c 100644..100755
--- a/lib/epson-escpr-err.h
+++ b/lib/epson-escpr-err.h
diff --git a/lib/epson-escpr-media.h b/lib/epson-escpr-media.h
index 4be5015..4be5015 100644..100755
--- a/lib/epson-escpr-media.h
+++ b/lib/epson-escpr-media.h
diff --git a/lib/epson-escpr-mem.c b/lib/epson-escpr-mem.c
index 7205e52..7205e52 100644..100755
--- a/lib/epson-escpr-mem.c
+++ b/lib/epson-escpr-mem.c
diff --git a/lib/epson-escpr-mem.h b/lib/epson-escpr-mem.h
index 70d4a50..70d4a50 100644..100755
--- a/lib/epson-escpr-mem.h
+++ b/lib/epson-escpr-mem.h
diff --git a/lib/epson-escpr-pvt.h b/lib/epson-escpr-pvt.h
index eb63fd2..eb63fd2 100644..100755
--- a/lib/epson-escpr-pvt.h
+++ b/lib/epson-escpr-pvt.h
diff --git a/lib/epson-escpr-services.c b/lib/epson-escpr-services.c
index 656fb12..656fb12 100644..100755
--- a/lib/epson-escpr-services.c
+++ b/lib/epson-escpr-services.c
diff --git a/lib/epson-escpr-services.h b/lib/epson-escpr-services.h
index 7ef27b6..7ef27b6 100644..100755
--- a/lib/epson-escpr-services.h
+++ b/lib/epson-escpr-services.h
diff --git a/lib/epson-layout.c b/lib/epson-layout.c
index d44e223..d44e223 100644..100755
--- a/lib/epson-layout.c
+++ b/lib/epson-layout.c
diff --git a/lib/epson-layout.h b/lib/epson-layout.h
index 2537ae7..2537ae7 100644..100755
--- a/lib/epson-layout.h
+++ b/lib/epson-layout.h
diff --git a/lib/epson-net-lpr.c b/lib/epson-net-lpr.c
index a184267..a184267 100644..100755
--- a/lib/epson-net-lpr.c
+++ b/lib/epson-net-lpr.c
diff --git a/lib/epson-net-lpr.h b/lib/epson-net-lpr.h
index 6c19c8d..6c19c8d 100644..100755
--- a/lib/epson-net-lpr.h
+++ b/lib/epson-net-lpr.h
diff --git a/lib/epson-net-raw.c b/lib/epson-net-raw.c
index e22c8a0..e22c8a0 100644..100755
--- a/lib/epson-net-raw.c
+++ b/lib/epson-net-raw.c
diff --git a/lib/epson-net-raw.h b/lib/epson-net-raw.h
index 5d58ec4..5d58ec4 100644..100755
--- a/lib/epson-net-raw.h
+++ b/lib/epson-net-raw.h
diff --git a/lib/epson-net-snmp.c b/lib/epson-net-snmp.c
index ea10cf3..ea10cf3 100644..100755
--- a/lib/epson-net-snmp.c
+++ b/lib/epson-net-snmp.c
diff --git a/lib/epson-net-snmp.h b/lib/epson-net-snmp.h
index 35b7f78..35b7f78 100644..100755
--- a/lib/epson-net-snmp.h
+++ b/lib/epson-net-snmp.h
diff --git a/lib/epson-protocol.c b/lib/epson-protocol.c
index 8a69047..8a69047 100644..100755
--- a/lib/epson-protocol.c
+++ b/lib/epson-protocol.c
diff --git a/lib/epson-protocol.h b/lib/epson-protocol.h
index 765ed0b..765ed0b 100644..100755
--- a/lib/epson-protocol.h
+++ b/lib/epson-protocol.h
diff --git a/lib/epson-typedefs.h b/lib/epson-typedefs.h
index 7f3681a..7f3681a 100644..100755
--- a/lib/epson-typedefs.h
+++ b/lib/epson-typedefs.h
diff --git a/lib/epson-usb.c b/lib/epson-usb.c
index 9b4af81..9b4af81 100644..100755
--- a/lib/epson-usb.c
+++ b/lib/epson-usb.c
diff --git a/lib/epson-usb.h b/lib/epson-usb.h
index 823677d..823677d 100644..100755
--- a/lib/epson-usb.h
+++ b/lib/epson-usb.h
diff --git a/lib/escpr_def.h b/lib/escpr_def.h
index 062a950..062a950 100644..100755
--- a/lib/escpr_def.h
+++ b/lib/escpr_def.h
diff --git a/lib/escpr_osdep.h b/lib/escpr_osdep.h
index 100dcdd..100dcdd 100644..100755
--- a/lib/escpr_osdep.h
+++ b/lib/escpr_osdep.h