syching with bb-cvs. rm .\#* on make dist-clean. nls updates.

[chaz/openbox] / nls / C / Makefile.am

diff --git a/nls/C/Makefile.am b/nls/C/Makefile.am
index 70423167f6c8ac2c0d7fd6beba5e0df7d01d40c1..8ef4289488af6c9fb94b4f6766ffa08a5f040417 100644 (file)
--- a/nls/C/Makefile.am
+++ b/nls/C/Makefile.am
@@ -1,38 +1,50 @@
-# Makefile.am for Blackbox - an X11 Window Manager
+# nls/C/Makefile.am for Blackbox - an X11 Window Manager
 
 NLSTEST = @NLS@
-THE_LANG = es_ES
-THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)
-CLEANFILES = blackbox.cat
+CLEANFILES = openbox.cat
 MAINTAINERCLEANFILES = Makefile.in Translation.m
 DISTCLEANFILES = Translation.m
 MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
 
-all-local: blackbox.cat
-install-data-local: blackbox.cat
-       @if test x$(NLSTEST) = "x-DNLS"; then \
-               echo "Installing catalog in $(THE_NLS_PATH)"; \
-               $(mkinstalldirs) $(THE_NLS_PATH); \
-               $(INSTALL_DATA) blackbox.cat $(THE_NLS_PATH); \
-               rm -f $(DESTDIR)$(pkgdatadir)/nls/es; \
-               ln -f -s es_ES $(DESTDIR)$(pkgdatadir)/nls/es; \
+all-local: Translation.m openbox.cat
+install-data-local: openbox.cat
+       @if test x$(NLSTEST) = "xyes"; then \
+               echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/C"; \
+               $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/C; \
+               $(INSTALL_DATA) openbox.cat $(DESTDIR)$(pkgdatadir)/nls/C; \
+               rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
+               ln -f -ss C $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
+               rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
+               ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
+               rm -f $(DESTDIR)$(pkgdatadir)/nls/en_US; \
+               ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en_US; \
+               rm -f $(DESTDIR)$(pkgdatadir)/nls/en_GB; \
+               ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en_GB; \
+               rm -f $(DESTDIR)$(pkgdatadir)/nls/en; \
+               ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en; \
        fi
 uninstall-local:
-       @if test x$(NLSTEST) = "x-DNLS"; then \
-               rm -f $(THE_NLS_PATH)/blackbox.cat; \
-               rm -f $(DESTDIR)$(pkgdatadir)/nls/es; \
-               rmdir $(THE_NLS_PATH); \
+       @if test x$(NLSTEST) = "xyes"; then \
+               rm -f $(DESTDIR)$(pkgdatadir)/nls/C/openbox.cat; \
+               rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
+               rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
+               rm -f $(DESTDIR)$(pkgdatadir)/nls/en_US; \
+               rm -f $(DESTDIR)$(pkgdatadir)/nls/en; \
+               rmdir $(DESTDIR)$(pkgdatadir)/nls/C; \
        fi
 
+# note... when adding new catalogs... you do not need the
+# header=../blackbox-nls.hh which is passed to awk... we
+# only need to generate it once.
+
 Translation.m: $(MFILES)
-       @if test x$(NLSTEST) = "x-DNLS"; then \
-               awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-       fi
+       awk -f @srcdir@/../convert.awk header=../blackbox-nls.hh \
+               output=Translation.m $(MFILES)
 
-blackbox.cat: Translation.m
-       @if test x$(NLSTEST) = "x-DNLS"; then \
-               $(gencat_cmd) blackbox.cat Translation.m; \
+openbox.cat: Translation.m
+       @if test x$(NLSTEST) = "xyes"; then \
+               $(gencat_cmd) openbox.cat Translation.m; \
        fi
 
 distclean-local:
-       rm -f *\~
+       rm -f *\~ .\#*