[Libreoffice-commits] core.git: configure.ac .gitignore lo.xcent lo.xcent.in Makefile.in

[Libreoffice Gerrit user]

 .gitignore   |    1 -
 Makefile.in  |    1 -
 configure.ac |    2 --
 3 files changed, 4 deletions(-)

New commits:
commit 14b95f66719269e94a717283cf5f6e9cfbd4aad5
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Dec 17 16:27:25 2018 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Dec 18 09:37:00 2018 +0100

    No more need to generate lo.xcent from lo.xcent.in
    
    ...after fd34a19b4d8ccbd8740cf6056be87b8c267caaec "Seems that we don't need the
    com.apple.application-identifier after all" dropped the last @...@ replacement
    there
    
    Change-Id: Id6f4d1065b28be12e5d727bab553daa17fc4dfcb
    Reviewed-on: https://gerrit.libreoffice.org/65275
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/.gitignore b/.gitignore
index 43d14908236c..170fca277117 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,7 +54,6 @@
 /config_build.mk
 /config_build_lang.mk
 /configure
-/lo.xcent
 /bin/bffvalidator.sh
 /bin/odfvalidator.sh
 /bin/officeotron.sh
diff --git a/Makefile.in b/Makefile.in
index 55ebf44dd8c4..0066401b869a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -219,7 +219,6 @@ distclean : clean compilerplugins-clean
         $(BUILDDIR)/config_host/*.h \
         $(BUILDDIR)/configure \
         $(BUILDDIR)/instsetoo_native/util/openoffice.lst \
-        $(BUILDDIR)/lo.xcent \
         $(BUILDDIR)/sysui/desktop/macosx/Info.plist
 	$(if $(filter WNT,$(OS)),env -i PATH="$$PATH") $(FIND) $(SRCDIR)/solenv/gdb -name \*.pyc -exec rm {} \;
 
diff --git a/configure.ac b/configure.ac
index 915dbe3772b7..29252ec28f81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4521,7 +4521,6 @@ if test "$cross_compiling" = "yes"; then
         config_host.mk.in \
         config_host_lang.mk.in \
         Makefile.in \
-        lo.xcent.in \
         bin/bffvalidator.sh.in \
         bin/odfvalidator.sh.in \
         bin/officeotron.sh.in \
@@ -12523,7 +12522,6 @@ CPPFLAGS=$my_original_CPPFLAGS
 AC_CONFIG_FILES([config_host.mk
                  config_host_lang.mk
                  Makefile
-                 lo.xcent
                  bin/bffvalidator.sh
                  bin/odfvalidator.sh
                  bin/officeotron.sh
diff --git a/lo.xcent.in b/lo.xcent
similarity index 100%
rename from lo.xcent.in
rename to lo.xcent