GNOME.org
 

Re: intltool rule patch

Is this a platform issue? I dont quite understand what problem you run into. 
Please enlighten me.

Kenneth

On 2002.03.15 21:12 jacob berkman wrote:

from the make info pages:

    Thus, a rule of the form

    %.o : %.c ; command...

    specifies how to make a file `n.o', with another file `n.c' as its
    prerequisite, provided that `n.c' exists or can be made.

i ran into this with xscreensaver. i don't know why it's a problem
other
than it doesn't use automake, but until i added the ; it didn't know
how
to build a .desktop file from a .desktop.in.

the attached patch adds ;'s to the rules.  the easiest way to test is
to
commit and see if tinderbox dies :/

jacob
--
"don't get me wrong, i think that radiohead are amazing. i love their
 music and i love their ethos, but that thom yorke guy always seems to
 be complaining." -- moby

? intltool-po-Makefile.in.in-patch-5
Index: intltool.m4
===================================================================
RCS file: /cvs/gnome/intltool/intltool.m4,v
retrieving revision 1.43
diff -u -r1.43 intltool.m4
--- intltool.m4	6 Mar 2002 22:17:19 -0000	1.43
+++ intltool.m4	15 Mar 2002 20:06:57 -0000
@@ -43,17 +43,17 @@
     fi
 fi

-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in
$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c
$(top_builddir)/po/.intltool-merge-cache'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in
$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c
$(top_builddir)/po/.intltool-merge-cache'
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in
$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -k -u -c
$(top_builddir)/po/.intltool-merge-cache'
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in
$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -o -p'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in
$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c
$(top_builddir)/po/.intltool-merge-cache'
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in
$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -o -u -c
$(top_builddir)/po/.intltool-merge-cache'
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in
$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c
$(top_builddir)/po/.intltool-merge-cache'
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in
$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c
$(top_builddir)/po/.intltool-merge-cache'
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in
$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c
$(top_builddir)/po/.intltool-merge-cache'
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in
$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c
$(top_builddir)/po/.intltool-merge-cache'
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in
$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c
$(top_builddir)/po/.intltool-merge-cache'
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   ;
$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c
$(top_builddir)/po/.intltool-merge-cache'
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in ;
$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c
$(top_builddir)/po/.intltool-merge-cache'
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      ;
$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -k -u -c
$(top_builddir)/po/.intltool-merge-cache'
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       ;
$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -o -p'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      ;
$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c
$(top_builddir)/po/.intltool-merge-cache'
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    ;
$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -o -u -c
$(top_builddir)/po/.intltool-merge-cache'
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     ;
$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c
$(top_builddir)/po/.intltool-merge-cache'
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in ;
$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c
$(top_builddir)/po/.intltool-merge-cache'
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        ;
$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c
$(top_builddir)/po/.intltool-merge-cache'
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       ;
$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c
$(top_builddir)/po/.intltool-merge-cache'
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     ;
$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c
$(top_builddir)/po/.intltool-merge-cache'

 AC_SUBST(INTLTOOL_DESKTOP_RULE)
 AC_SUBST(INTLTOOL_DIRECTORY_RULE)
Index: xml-i18n-tools.m4
===================================================================
RCS file: /cvs/gnome/intltool/xml-i18n-tools.m4,v
retrieving revision 1.34
diff -u -r1.34 xml-i18n-tools.m4
--- xml-i18n-tools.m4	29 Jan 2002 18:20:09 -0000	1.34
+++ xml-i18n-tools.m4	15 Mar 2002 20:06:57 -0000
@@ -34,15 +34,15 @@
   AC_DEFUN(X18T_KEYS_KIND,
         ifelse([$2],[G2],[ -u ],[ $(XML_I18N_KEYS_KIND) ]))

-  XML_I18N_MERGE_DESKTOP_RULE='%.desktop:   %.desktop.in
$(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ;
$(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -d
X18T_PFORG1'
-XML_I18N_MERGE_DIRECTORY_RULE='%.directory: %.directory.in
$(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ;
$(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -d
X18T_PFORG1'
-     XML_I18N_MERGE_KEYS_RULE='%.keys:      %.keys.in
$(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ;
$(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -k
X18T_KEYS_KIND'
-      XML_I18N_MERGE_OAF_RULE='%.oaf:       %.oaf.in
$(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ;
$(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -o -p'
-     XML_I18N_MERGE_PONG_RULE='%.pong:      %.pong.in
$(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ;
$(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -x
X18T_PFORG1'
-   XML_I18N_MERGE_SERVER_RULE='%.server:    %.server.in
$(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ;
$(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -o -u'
-    XML_I18N_MERGE_SHEET_RULE='%.sheet:     %.sheet.in
$(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ;
$(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -x -u'
-XML_I18N_MERGE_SOUNDLIST_RULE='%.soundlist: %.soundlist.in
$(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ;
$(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -d
X18T_PFORG1'
-      XML_I18N_MERGE_XML_RULE='%.xml:       %.xml.in
$(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ;
$(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -x
X18T_XML_KIND'
+  XML_I18N_MERGE_DESKTOP_RULE='%.desktop:   %.desktop.in   ;
$(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ;
$(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -d
X18T_PFORG1'
+XML_I18N_MERGE_DIRECTORY_RULE='%.directory: %.directory.in ;
$(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ;
$(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -d
X18T_PFORG1'
+     XML_I18N_MERGE_KEYS_RULE='%.keys:      %.keys.in      ;
$(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ;
$(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -k
X18T_KEYS_KIND'
+      XML_I18N_MERGE_OAF_RULE='%.oaf:       %.oaf.in       ;
$(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ;
$(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -o -p'
+     XML_I18N_MERGE_PONG_RULE='%.pong:      %.pong.in      ;
$(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ;
$(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -x
X18T_PFORG1'
+   XML_I18N_MERGE_SERVER_RULE='%.server:    %.server.in    ;
$(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ;
$(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -o -u'
+    XML_I18N_MERGE_SHEET_RULE='%.sheet:     %.sheet.in     ;
$(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ;
$(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -x -u'
+XML_I18N_MERGE_SOUNDLIST_RULE='%.soundlist: %.soundlist.in ;
$(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ;
$(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -d
X18T_PFORG1'
+      XML_I18N_MERGE_XML_RULE='%.xml:       %.xml.in       ;
$(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ;
$(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -x
X18T_XML_KIND'

 AC_SUBST(XML_I18N_MERGE_DESKTOP_RULE)
 AC_SUBST(XML_I18N_MERGE_DIRECTORY_RULE)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]