| OLD | NEW | 
|---|
| 1 # vim:set noet ts=4: | 1 # vim:set noet ts=4: | 
| 2 # | 2 # | 
| 3 # ibus - The Input Bus | 3 # ibus - The Input Bus | 
| 4 # | 4 # | 
| 5 # Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com> | 5 # Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com> | 
| 6 # Copyright (c) 2007-2010 Red Hat, Inc. | 6 # Copyright (c) 2007-2010 Red Hat, Inc. | 
| 7 # | 7 # | 
| 8 # This library is free software; you can redistribute it and/or | 8 # This library is free software; you can redistribute it and/or | 
| 9 # modify it under the terms of the GNU Lesser General Public | 9 # modify it under the terms of the GNU Lesser General Public | 
| 10 # License as published by the Free Software Foundation; either | 10 # License as published by the Free Software Foundation; either | 
| 11 # version 2 of the License, or (at your option) any later version. | 11 # version 2 of the License, or (at your option) any later version. | 
| 12 # | 12 # | 
| 13 # This library is distributed in the hope that it will be useful, | 13 # This library is distributed in the hope that it will be useful, | 
| 14 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 14 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 
| 16 # GNU Lesser General Public License for more details. | 16 # GNU Lesser General Public License for more details. | 
| 17 # | 17 # | 
| 18 # You should have received a copy of the GNU Lesser General Public | 18 # You should have received a copy of the GNU Lesser General Public | 
| 19 # License along with this program; if not, write to the | 19 # License along with this program; if not, write to the | 
| 20 # Free Software Foundation, Inc., 59 Temple Place, Suite 330, | 20 # Free Software Foundation, Inc., 59 Temple Place, Suite 330, | 
| 21 # Boston, MA  02111-1307  USA | 21 # Boston, MA  02111-1307  USA | 
| 22 | 22 | 
| 23 SUBDIRS =       \ | 23 SUBDIRS =       \ | 
| 24         src         \ | 24         src         \ | 
| 25 »       gconf       \ | 25 »       memconf     \ | 
| 26         util        \ | 26         util        \ | 
| 27         client      \ | 27         client      \ | 
| 28         bus         \ | 28         bus         \ | 
| 29         data        \ | 29         data        \ | 
| 30         m4          \ | 30         m4          \ | 
| 31         po          \ | 31         po          \ | 
| 32         docs        \ | 32         docs        \ | 
| 33         $(NULL) | 33         $(NULL) | 
| 34 | 34 | 
| 35 if ENABLE_PYTHON | 35 if ENABLE_PYTHON | 
| 36 SUBDIRS +=      \ | 36 SUBDIRS +=      \ | 
| 37         ibus        \ | 37         ibus        \ | 
| 38         ui          \ | 38         ui          \ | 
| 39         setup       \ | 39         setup       \ | 
| 40         $(NULL) | 40         $(NULL) | 
| 41 endif | 41 endif | 
| 42 | 42 | 
|  | 43 if ENABLE_GCONF | 
|  | 44 SUBDIRS +=      \ | 
|  | 45         gconf       \ | 
|  | 46         $(NULL) | 
|  | 47 endif | 
|  | 48 | 
| 43 ACLOCAL_AMFLAGS = -I m4 | 49 ACLOCAL_AMFLAGS = -I m4 | 
| 44 | 50 | 
| 45 pkgconfigdir = $(libdir)/pkgconfig | 51 pkgconfigdir = $(libdir)/pkgconfig | 
| 46 pkgconfig_DATA = ibus-1.0.pc | 52 pkgconfig_DATA = ibus-1.0.pc | 
| 47 | 53 | 
| 48 # xinitrc_SCRIPTS = \ | 54 # xinitrc_SCRIPTS = \ | 
| 49 #       ibus.sh \ | 55 #       ibus.sh \ | 
| 50 #       $(NULL) | 56 #       $(NULL) | 
| 51 # xinitrcdir = $(sysconfdir)/X11/xinit/xinitrc.d | 57 # xinitrcdir = $(sysconfdir)/X11/xinit/xinitrc.d | 
| 52 | 58 | 
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 96                         --define "_specdir `pwd`/rpm" \ | 102                         --define "_specdir `pwd`/rpm" \ | 
| 97                         @PACKAGE_NAME@.spec | 103                         @PACKAGE_NAME@.spec | 
| 98 | 104 | 
| 99 clean-rpm: | 105 clean-rpm: | 
| 100         $(RM) -r "`uname -i`" | 106         $(RM) -r "`uname -i`" | 
| 101 | 107 | 
| 102 clean-local: clean-rpm | 108 clean-local: clean-rpm | 
| 103 | 109 | 
| 104 git-tag: | 110 git-tag: | 
| 105         git tag @PACKAGE_VERSION@ | 111         git tag @PACKAGE_VERSION@ | 
| OLD | NEW | 
|---|