Attachment #1640 for bug #1151

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1151
Collapse All | Expand All




UIC=`echo $UIC -L \$\(top_builddir\)/kmymoney2/widgets/.libs`

#
# get qt plugins directory
#

if test "$PKG_CONFIG" != "no" ; then
  if $PKG_CONFIG --exists qt-mt ; then
    qt_plugins_dir="`pkg-config --variable=pluginsdir qt-mt`"
  else
    if $PKG_CONFIG --exists tqt-mt ; then
      qt_plugins_dir="`pkg-config --variable=pluginsdir tqt-mt`"
    fi
  fi
fi
if test "x$qt_plugins_dir" = "x"; then
  qt_plugins_dir=$(qt_libraries)/../plugins
fi
AC_SUBST(qt_plugins_dir)

#
# create header directory, make symlinks
#





# Hence the quick hack to include the required objects from the
# libkmm_mymoney.so directly into libkmymoney.so
libkmymoney_la_CXXFLAGS = -U_CHECK_MEMORY -DKMM_DESIGNER
libkmymoney_la_LDFLAGS = `ls ../mymoney/*.lo` $(KDE_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) -rpath $(DESTDIR)$(qt_plugins_dir)/designer $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)

if INSTALL_QTDESIGNER_SUPPORT
install-exec-local: libkmymoney.la
	$(mkinstalldirs) $(DESTDIR)$(qt_plugins_dir)/designer
	$(INSTALL_PROGRAM) .libs/libkmymoney.so $(DESTDIR)$(qt_plugins_dir)/designer
	$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/$(PICS_DIR)
	for file in $(WIDGET_PNGS); do \
	  $(INSTALL_DATA) $(abs_srcdir)/$$file $(DESTDIR)$(kde_datadir)/$(PICS_DIR); \
	done

uninstall-local:
	-rm $(DESTDIR)$(qt_plugins_dir)/designer/libkmymoney.so
	for file in $(WIDGET_PNGS); do \
	  rm -rf $(DESTDIR)$(kde_datadir)/$(PICS_DIR)/$$file; \
	done

Return to bug 1151

Lines 78-83 fi Link Here

(-)a/configure.in.in (+18 lines)
78	UIC=`echo $UIC -L \$\(top_builddir\)/kmymoney2/widgets/.libs`	78	UIC=`echo $UIC -L \$\(top_builddir\)/kmymoney2/widgets/.libs`
79		79
80	#	80	#
		81	# get qt plugins directory
		82	#
		83
		84	if test "$PKG_CONFIG" != "no" ; then
		85	if $PKG_CONFIG --exists qt-mt ; then
		86	qt_plugins_dir="`pkg-config --variable=pluginsdir qt-mt`"
		87	else
		88	if $PKG_CONFIG --exists tqt-mt ; then
		89	qt_plugins_dir="`pkg-config --variable=pluginsdir tqt-mt`"
		90	fi
		91	fi
		92	fi
		93	if test "x$qt_plugins_dir" = "x"; then
		94	qt_plugins_dir=$(qt_libraries)/../plugins
		95	fi
		96	AC_SUBST(qt_plugins_dir)
		97
		98	#
81	# create header directory, make symlinks	99	# create header directory, make symlinks
82	#	100	#
83		101

Lines 68-86 kmmwidgets.cpp: $(srcdir)/kmymoney.widgets Link Here

(-)a/kmymoney2/widgets/Makefile.am (-4 / +4 lines)
68	# Hence the quick hack to include the required objects from the	68	# Hence the quick hack to include the required objects from the
69	# libkmm_mymoney.so directly into libkmymoney.so	69	# libkmm_mymoney.so directly into libkmymoney.so
70	libkmymoney_la_CXXFLAGS = -U_CHECK_MEMORY -DKMM_DESIGNER	70	libkmymoney_la_CXXFLAGS = -U_CHECK_MEMORY -DKMM_DESIGNER
71	libkmymoney_la_LDFLAGS = `ls ../mymoney/*.lo` $(KDE_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) -rpath $(DESTDIR)$(qt_libraries)/../plugins/designer $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)	71	libkmymoney_la_LDFLAGS = `ls ../mymoney/*.lo` $(KDE_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) -rpath $(DESTDIR)$(qt_plugins_dir)/designer $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
72		72
73	if INSTALL_QTDESIGNER_SUPPORT	73	if INSTALL_QTDESIGNER_SUPPORT
74	install-exec-local: libkmymoney.la	74	install-exec-local: libkmymoney.la
75	$(mkinstalldirs) $(DESTDIR)$(qt_libraries)/../plugins/designer	75	$(mkinstalldirs) $(DESTDIR)$(qt_plugins_dir)/designer
76	$(INSTALL_PROGRAM) .libs/libkmymoney.so $(DESTDIR)$(qt_libraries)/../plugins/designer	76	$(INSTALL_PROGRAM) .libs/libkmymoney.so $(DESTDIR)$(qt_plugins_dir)/designer
77	$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/$(PICS_DIR)	77	$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/$(PICS_DIR)
78	for file in $(WIDGET_PNGS); do \	78	for file in $(WIDGET_PNGS); do \
79	$(INSTALL_DATA) $(abs_srcdir)/$$file $(DESTDIR)$(kde_datadir)/$(PICS_DIR); \	79	$(INSTALL_DATA) $(abs_srcdir)/$$file $(DESTDIR)$(kde_datadir)/$(PICS_DIR); \
80	done	80	done
81		81
82	uninstall-local:	82	uninstall-local:
83	-rm $(DESTDIR)$(qt_libraries)/../plugins/designer/libkmymoney.so	83	-rm $(DESTDIR)$(qt_plugins_dir)/designer/libkmymoney.so
84	for file in $(WIDGET_PNGS); do \	84	for file in $(WIDGET_PNGS); do \
85	rm -rf $(DESTDIR)$(kde_datadir)/$(PICS_DIR)/$$file; \	85	rm -rf $(DESTDIR)$(kde_datadir)/$(PICS_DIR)/$$file; \
86	done	86	done