Группа :: Офис
Пакет: moneymanagerex
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: moneymanagerex-wxsqlite3.patch
Скачать
Скачать
diff --git a/moneymanagerex/Makefile.in b/moneymanagerex/Makefile.in
index 6647591..f894245 100644
--- a/moneymanagerex/Makefile.in
+++ b/moneymanagerex/Makefile.in
@@ -100,13 +100,13 @@ LUA_OBJECTS = \
lua_lundump.o \
lua_lvm.o \
lua_lzio.o
-MMEX_CFLAGS = -I$(srcdir)/lib/wxsqlite3/sqlite3/secure/src \
- -I$(srcdir)/lib/wxsqlite3/include -I$(srcdir)/lib/lua/src -I$(srcdir)/lib \
+MMEX_CFLAGS = \
+ -I/usr/include/wxsqlite3-3.1/include/wx -I$(srcdir)/lib/lua/src -I$(srcdir)/lib \
-I$(srcdir)/3rd -I$(srcdir)/3rd/LuaGlue/include \
-I$(srcdir)/3rd/cgitemplate -I$(srcdir)/3rd/csv-parser/include \
-I$(srcdir)/src -DNOPCH $(WX_CFLAGS) $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS)
-MMEX_CXXFLAGS = -I$(srcdir)/lib/wxsqlite3/sqlite3/secure/src \
- -I$(srcdir)/lib/wxsqlite3/include -I$(srcdir)/lib/lua/src -I$(srcdir)/lib \
+MMEX_CXXFLAGS = \
+ -I/usr/include/wxsqlite3-3.1/include/wx -I$(srcdir)/lib/lua/src -I$(srcdir)/lib \
-I$(srcdir)/3rd -I$(srcdir)/3rd/LuaGlue/include \
-I$(srcdir)/3rd/cgitemplate -I$(srcdir)/3rd/csv-parser/include \
-I$(srcdir)/src -DNOPCH $(WX_CXXFLAGS) $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
@@ -252,7 +252,7 @@ COND_PLATFORM_OS2_1___mmex___os2_emxbindcmd = $(NM) mmex$(EXEEXT) | if grep -q \
### Targets: ###
-all: $(LIBPREFIX)wxsqlite$(LIBEXT) $(LIBPREFIX)lua$(LIBEXT) mmex$(EXEEXT) po
+all: $(LIBPREFIX)lua$(LIBEXT) mmex$(EXEEXT) po
install: install_mmex
$(INSTALL_DIR) $(DESTDIR)$(respath)
@@ -318,7 +318,6 @@ install-strip: install
clean:
rm -rf ./.deps ./.pch
rm -f ./*.o
- rm -f $(LIBPREFIX)wxsqlite$(LIBEXT)
rm -f $(LIBPREFIX)lua$(LIBEXT)
rm -f mmex$(EXEEXT)
-(cd $(srcdir)/po && $(MAKE) clean)
@@ -327,18 +326,13 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-(cd $(srcdir)/po && $(MAKE) distclean)
-$(LIBPREFIX)wxsqlite$(LIBEXT): $(WXSQLITE_OBJECTS)
- rm -f $@
- $(AR) $(AROPTIONS) $@ $(WXSQLITE_OBJECTS)
- $(RANLIB) $@
-
$(LIBPREFIX)lua$(LIBEXT): $(LUA_OBJECTS)
rm -f $@
$(AR) $(AROPTIONS) $@ $(LUA_OBJECTS)
$(RANLIB) $@
-mmex$(EXEEXT): $(MMEX_OBJECTS) $(LIBPREFIX)wxsqlite$(LIBEXT) $(LIBPREFIX)lua$(LIBEXT) $(__mmex___win32rc)
- $(CXX) -o $@ $(MMEX_OBJECTS) -L. -L. $(LDFLAGS_GUI) $(LDFLAGS) -lwxsqlite -llua $(WX_LIBS) -ldl
+mmex$(EXEEXT): $(MMEX_OBJECTS) $(LIBPREFIX)lua$(LIBEXT) $(__mmex___win32rc)
+ $(CXX) -o $@ $(MMEX_OBJECTS) -L. -L. $(LDFLAGS_GUI) $(LDFLAGS) -lwxcode_gtk3u_wxsqlite3-3.1 -llua $(WX_LIBS) -ldl
$(__mmex___mac_setfilecmd)
$(__mmex___os2_emxbindcmd)
@@ -807,7 +801,7 @@ mmex_csv_parser.o: $(srcdir)/3rd/csv-parser/csv_parser.cpp
$(CXXC) -c -o $@ $(MMEX_CXXFLAGS) $(srcdir)/3rd/csv-parser/csv_parser.cpp
mmex_resources_mmex_rc.o: $(srcdir)/resources/mmex.rc
- $(WX_RESCOMP) -i$< -o$@ --include-dir $(srcdir)/lib/wxsqlite3/sqlite3/secure/src --include-dir $(srcdir)/lib/wxsqlite3/include --include-dir $(srcdir)/lib/lua/src --include-dir $(srcdir)/lib --include-dir $(srcdir)/3rd --include-dir $(srcdir)/3rd/LuaGlue/include --include-dir $(srcdir)/3rd/cgitemplate --include-dir $(srcdir)/3rd/csv-parser/include --include-dir $(srcdir)/src --define NOPCH
+ $(WX_RESCOMP) -i$< -o$@ --include-dir /usr/include/wxsqlite3-3.1/include/wx --include-dir $(srcdir)/lib/lua/src --include-dir $(srcdir)/lib --include-dir $(srcdir)/3rd --include-dir $(srcdir)/3rd/LuaGlue/include --include-dir $(srcdir)/3rd/cgitemplate --include-dir $(srcdir)/3rd/csv-parser/include --include-dir $(srcdir)/src --define NOPCH
# Include dependency info, if present: