Move gtktiledviewer into libreofficekit.

desktop is no longer the right place for it now that
libreofficekit has its own directory.

Change-Id: I207f1d642e7e35c460ff85bb57aa142cb98023c8
This commit is contained in:
Andrzej Hunt
2014-06-13 11:20:15 +01:00
parent ff6a38b76d
commit 0cea87d60c
4 changed files with 10 additions and 17 deletions

View File

@@ -29,14 +29,6 @@ $(eval $(call gb_Module_add_l10n_targets,desktop,\
UIConfig_deployment \
))
ifeq ($(OS),LINUX)
ifneq ($(ENABLE_GTK),)
$(eval $(call gb_Module_add_targets,desktop,\
Executable_gtktiledviewer \
))
endif
endif
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,desktop,\
Executable_soffice_bin \

View File

@@ -43,7 +43,7 @@ $(eval $(call gb_Executable_add_libs,gtktiledviewer,\
endif
$(eval $(call gb_Executable_add_exception_objects,gtktiledviewer,\
desktop/qa/gtktiledviewer/gtktiledviewer \
libreofficekit/qa/gtktiledviewer/gtktiledviewer \
))
# vim: set noet sw=4 ts=4:

View File

@@ -10,10 +10,18 @@
$(eval $(call gb_Module_Module,libreofficekit))
ifeq ($(OS),LINUX)
$(eval $(call gb_Module_add_targets,libreofficekit,\
StaticLibrary_libreofficekit \
Library_libreofficekitgtk \
))
endif
ifneq ($(ENABLE_GTK),)
$(eval $(call gb_Module_add_targets,libreofficekit,\
Executable_gtktiledviewer \
))
endif # ($(ENABLE_GTK),)
endif # ($(OS),LINUX)
# vim: set ts=4 sw=4 et:

View File

@@ -34,13 +34,6 @@ int main( int argc, char* argv[] )
}
LibreOfficeKit* pOffice = lok_init( argv[1] );
if( !pOffice )
{
fprintf( stderr, "Failed to initialize\n" );
return -1;
}
::lok::Document* pDocument = pOffice->documentLoad( argv[2] );
gtk_init( &argc, &argv );