Revision: e95b4fcea782 Author: nogu.dev <[email protected]> Date: Fri Mar 9 20:46:41 2012 Log: * qt3/candwin/Makefile.am * qt3/pref/Makefile.am * qt3/switcher/Makefile.am - Don't define QT_CXXFLAGS and QT_LDFLAGS to avoid "possible typo" message from automake.
http://code.google.com/p/uim/source/detail?r=e95b4fcea782 Modified: /qt3/candwin/Makefile.am /qt3/pref/Makefile.am /qt3/switcher/Makefile.am ======================================= --- /qt3/candwin/Makefile.am Tue May 24 07:49:05 2011 +++ /qt3/candwin/Makefile.am Fri Mar 9 20:46:41 2012 @@ -1,7 +1,5 @@ if QT INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I.. -QT_CXXFLAGS = $(UIM_QT_CXXFLAGS) -QT_LDFLAGS = $(UIM_QT_LDFLAGS) HEADER_FILES = qt.h MOC_FILES = qt.moc @@ -10,8 +8,8 @@ # Candidate Window uim_candwin_qt_SOURCES = qt.cpp qt.h ../qtgettext.h -uim_candwin_qt_CXXFLAGS = $(QT_CXXFLAGS) -uim_candwin_qt_LDFLAGS = $(QT_LDFLAGS) +uim_candwin_qt_CXXFLAGS = $(UIM_QT_CXXFLAGS) +uim_candwin_qt_LDFLAGS = $(UIM_QT_LDFLAGS) uim_candwin_qt_LDADD = $(top_builddir)/uim/libuim-scm.la \ $(top_builddir)/uim/libuim.la qt.cpp: qt.moc ======================================= --- /qt3/pref/Makefile.am Tue May 24 07:49:05 2011 +++ /qt3/pref/Makefile.am Fri Mar 9 20:46:41 2012 @@ -2,8 +2,6 @@ if QT INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I.. -QT_CXXFLAGS = $(UIM_QT_CXXFLAGS) -QT_LDFLAGS = $(UIM_QT_LDFLAGS) if PREF HEADER_FILES = \ @@ -39,8 +37,8 @@ ../qtgettext.h qt.h \ customwidgets.h kseparator.h -uim_pref_qt_CXXFLAGS = $(QT_CXXFLAGS) -uim_pref_qt_LDFLAGS = $(QT_LDFLAGS) +uim_pref_qt_CXXFLAGS = $(UIM_QT_CXXFLAGS) +uim_pref_qt_LDFLAGS = $(UIM_QT_LDFLAGS) uim_pref_qt_LDADD = $(top_builddir)/uim/libuim-counted-init.la \ $(top_builddir)/uim/libuim-custom.la \ $(top_builddir)/uim/libuim-scm.la \ ======================================= --- /qt3/switcher/Makefile.am Tue May 24 07:49:05 2011 +++ /qt3/switcher/Makefile.am Fri Mar 9 20:46:41 2012 @@ -1,7 +1,5 @@ if QT INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I.. -QT_CXXFLAGS = $(UIM_QT_CXXFLAGS) -QT_LDFLAGS = $(UIM_QT_LDFLAGS) HEADER_FILES = qt.h @@ -13,8 +11,8 @@ # Switcher uim_im_switcher_qt_SOURCES = qt.cpp qt.h ../qtgettext.h -uim_im_switcher_qt_CXXFLAGS = $(QT_CXXFLAGS) -uim_im_switcher_qt_LDFLAGS = $(QT_LDFLAGS) +uim_im_switcher_qt_CXXFLAGS = $(UIM_QT_CXXFLAGS) +uim_im_switcher_qt_LDFLAGS = $(UIM_QT_LDFLAGS) uim_im_switcher_qt_LDADD = $(top_builddir)/uim/libuim-scm.la \ $(top_builddir)/uim/libuim.la \ $(top_builddir)/uim/libuim-custom.la
