Attachment #763 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




# 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)${QTPLUGINS}/designer $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)

if INSTALL_QTDESIGNER_SUPPORT
install-exec-local: libkmymoney.la
	$(mkinstalldirs) $(DESTDIR)${QTPLUGINS}/designer
	$(INSTALL_PROGRAM) .libs/libkmymoney.so $(DESTDIR)${QTPLUGINS}/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)${QTPLUGINS}/designer/libkmymoney.so
	for file in $(WIDGET_PNGS); do \
	  rm -rf $(DESTDIR)$(kde_datadir)/$(PICS_DIR)/$$file; \
	done

Lines 6724-6730 Link Here

(-)kmymoney/admin/acinclude.m4.ORI (-1 / +5 lines)
6724	QTDIR=`dirname $MOC`	6724	QTDIR=`dirname $MOC`
6725	QTDIR=${QTDIR%/bin}	6725	QTDIR=${QTDIR%/bin}
6726	fi	6726	fi
6727	LIBSQLITE3=${QTDIR}/plugins/sqldrivers/libsqlite3${qtlib}.so	6727	if test x$QTPLUGINS = x; then
		6728	LIBSQLITE3=${QTDIR}/plugins/sqldrivers/libsqlite3${qtlib}.so
		6729	else
		6730	LIBSQLITE3=${QTPLUGINS}/sqldrivers/libsqlite3${qtlib}.so
		6731	fi
6728		6732
6729	# do the checks	6733	# do the checks
6730	if test $enable_sqlite3 = auto; then	6734	if test $enable_sqlite3 = auto; then

Return to bug 1151

Lines 68-86 Link Here

(-)kmymoney/kmymoney2/widgets/Makefile.am.ORI (-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_KDEUI) $(LIB_KDECORE) $(LIB_QT)	71	libkmymoney_la_LDFLAGS = `ls ../mymoney/*.lo` $(KDE_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) -rpath $(DESTDIR)${QTPLUGINS}/designer $(LIB_KDEUI) $(LIB_KDECORE) $(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)${QTPLUGINS}/designer
76	$(INSTALL_PROGRAM) .libs/libkmymoney.so $(DESTDIR)$(qt_libraries)/../plugins/designer	76	$(INSTALL_PROGRAM) .libs/libkmymoney.so $(DESTDIR)${QTPLUGINS}/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)${QTPLUGINS}/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