X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=blobdiff_plain;f=locale%2FMakefile;h=4db478ce939186c9f9a70c1ab4d81c29a75528d1;hp=68ab1f3ed006f8b943e14cb019191507bf9cdf77;hb=e310189747c161ac6e737eedadf8f45d11bf2253;hpb=f0ab5bff8ab3f7b00619675b806b1f01294a3f6a;ds=sidebyside

diff --git a/locale/Makefile b/locale/Makefile
index 68ab1f3ed..4db478ce9 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -1,23 +1,17 @@
 #
-# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $"
+# Locale file makefile for CUPS.
 #
-#   Locale file makefile for the Common UNIX Printing System (CUPS).
+# Copyright 2007-2017 by Apple Inc.
+# Copyright 1993-2007 by Easy Software Products.
 #
-#   Copyright 2007-2008 by Apple Inc.
-#   Copyright 1993-2007 by Easy Software Products.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
 #
 
 include ../Makedefs
 
 
-OBJS	=	checkpo.o po2strings.o strings2po.o translate.o
-TARGETS	=	checkpo po2strings strings2po translate
+OBJS	=	checkpo.o po2strings.o strings2po.o
+TARGETS	=	checkpo po2strings strings2po
 
 
 #
@@ -54,7 +48,7 @@ clean:
 #
 
 depend:
-	makedepend -Y -I.. -fDependencies $(OBJS:.o=.c) >/dev/null 2>&1
+	$(CC) -MM $(ALL_CFLAGS) $(OBJS:.o=.c) >Dependencies
 
 
 #
@@ -79,6 +73,10 @@ install-languages:
 		fi ; \
 	done
 
+install-langbundle: po2strings
+	$(INSTALL_DIR) -m 755 "$(BUILDROOT)$(BUNDLEDIR)/Resources/English.lproj"
+	$(INSTALL_DATA) cups.strings "$(BUILDROOT)$(BUNDLEDIR)/Resources/English.lproj"
+
 
 #
 # Install programs...
@@ -112,91 +110,86 @@ uninstall-languages:
 		$(RM) $(LOCALEDIR)/$$loc/cups_$$loc.po ; \
 	done
 
+uninstall-langbundle:
+	$(RM) "$(BUILDROOT)$(BUNDLEDIR)/Resources/English.lproj/cups.strings"
+
 
 #
-# pot - Creates/updates the cups.pot template file, and merges changes
-#       into existing message catalogs.
+# pot - Creates/updates the cups.pot template file, merges changes into existing
+#       message catalogs, and updates the cups.strings file.  We don't use
+#       xgettext to update the cups.strings file due to known xgettext bugs.
 #
 
-pot:
+pot:	checkpo po2strings
 	echo Updating cups.pot...
 	mv cups.pot cups.pot.bck
 	touch cups.pot
-	cd ..; xgettext -o locale/cups.pot -j -s --keyword=_ --no-wrap \
+	cd ..; xgettext -o locale/cups.pot -cTRANSLATORS -s \
+		--keyword=_ --no-wrap \
 		--copyright-holder="Apple Inc." \
-		--msgid-bugs-address="http://www.cups.org/str.php" \
+		--package-name="CUPS" --package-version="$(CUPS_VERSION)" \
+		--msgid-bugs-address="https://github.com/apple/cups/issues" \
 		*/*.c */*.cxx
-	(cat cups.header; \
-	 cat cups.pot | sed -e '1,6d' -e '1,$$s/PACKAGE VERSION/CUPS 1.4/' \
-	     -e '1,$$s/charset=CHARSET/charset=utf-8/'; \
-	 cat cups.footer) > cups.pot.N
+	(cat cups.header; tail +6 cups.pot; cat cups.footer) > cups.pot.N
 	mv cups.pot.N cups.pot
-	for loc in $(LANGUAGES) ; do \
-		echo Merging changes into cups_$$loc.po... ; \
-		msgmerge -o cups_$$loc.po -s -N --no-location cups_$$loc.po cups.pot ; \
+	echo Checking cups.pot...
+	./checkpo cups.pot
+	for loc in *.po ; do \
+		if test $$loc = '*.po'; then \
+			break; \
+		fi; \
+		echo Merging changes into $$loc... ; \
+		msgmerge -o $$loc -s -N --no-location $$loc cups.pot ; \
 	done
+	echo Updating cups.strings...
+	./po2strings cups.pot cups.strings
 
 
 #
 # checkpo - A simple utility to check PO files for correct translation
-#           strings.
+#           strings.  Dependency on static library is deliberate.
 #
 # checkpo filename.po [... filenameN.po]
 #
 
-checkpo:	checkpo.o ../cups/$(LIBCUPS)
-	echo Linking $<...
-	$(CC) $(LDFLAGS) -o checkpo checkpo.o $(LIBS)
+checkpo:	checkpo.o ../cups/$(LIBCUPSSTATIC)
+	echo Linking $@...
+	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o checkpo checkpo.o \
+		../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
+		$(COMMONLIBS) $(LIBZ)
 
 checkall:	checkpo
-	for file in *.po; do \
-		./checkpo $$file; \
-	done
+	./checkpo *.po *.strings
 
 
 #
 # po2strings - A simple utility which uses iconv to convert GNU gettext
-#              message catalogs to Mac OS X .strings files.
+#              message catalogs to macOS .strings files.
 #
 # po2strings filename.po filename.strings
 #
 
-po2strings:	po2strings.o ../cups/$(LIBCUPS)
-	echo Linking $<...
-	$(CC) $(LDFLAGS) -o po2strings po2strings.o $(LIBS)
+po2strings:	po2strings.o ../cups/$(LIBCUPSSTATIC)
+	echo Linking $@...
+	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o po2strings po2strings.o \
+		../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
+		$(COMMONLIBS) $(LIBZ)
 
 
 #
-# strings2po - A simple utility which uses iconv to convert Mac OS X
-#              .strings files to GNU gettext message catalogs.
+# strings2po - A simple utility which uses iconv to convert macOS .strings files
+#              to GNU gettext message catalogs.
 #
 # strings2po filename.strings filename.po
 #
 
 strings2po:	strings2po.o
-	echo Linking $<...
-	$(CC) $(LDFLAGS) -o strings2po strings2po.o
-
-
-#
-# translate - A simple utility which uses Google to translate the cups.pot
-#             file to one of several languages.
-#
-# translate outfile language
-#
-
-translate:	translate.o ../cups/$(LIBCUPS)
-	echo Linking $<...
-	$(CC) $(LDFLAGS) -o translate translate.o $(LIBS)
+	echo Linking $@...
+	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o strings2po strings2po.o
 
 
 #
 # Dependencies...
 #
-  
-include Dependencies
 
-
-#
-# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $".
-#
+include Dependencies