Get rid of gen_makefile, always use the clever way to generate rtlbootstrap.mk

2 files changed, 2 insertions, 64 deletions

diff --git a/sal/rtl/source/gen_makefile.cxx b/sal/rtl/source/gen_makefile.cxx
deleted file mode 100644
index 9bdbe5a1f39a..000000000000
--- a/sal/rtl/source/gen_makefile.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sal.hxx"
-
-#include "macro.hxx"
-#include <stdio.h>
-
-int main()
-{
-  printf( "RTL_OS:=%s\n", THIS_OS );
-  printf( "RTL_ARCH:=%s\n", THIS_ARCH );
-  return 0;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/makefile.mk b/sal/rtl/source/makefile.mk
index bb2715f69590..2f1f610a5330 100644
--- a/sal/rtl/source/makefile.mk
+++ b/sal/rtl/source/makefile.mk
@@ -56,10 +56,6 @@ CXXFLAGS+= $(LFS_CFLAGS)
 
 # --- Files --------------------------------------------------------
 
-# safe that way: gen_makefile doesn't want it,
-# no other link target here
-UWINAPILIB:=
-
 .IF "$(header)" == ""
 
 .IF "$(OS)" != "AIX"
@@ -128,13 +124,6 @@ OBJFILES=   \
             $(OBJ)$/alloc_fini.obj
 
 
-.IF "$(CROSS_COMPILING)"==""
-APP1TARGET=gen_makefile
-APP1OBJS=$(SLO)$/gen_makefile.obj
-APP1LIBSALCPPRT=
-APP1RPATH=NONE
-.ENDIF
-
 .ENDIF
 
 # --- Makefile snippet  --------------------------------------------
@@ -171,14 +160,6 @@ $(ALWAYSDBGFILES):
 
 ALLTAR : $(BOOTSTRAPMK)
 
-.IF "$(CROSS_COMPILING)"==""
-
-$(BOOTSTRAPMK) : $(APP1TARGETN)
-    $(AUGMENT_LIBRARY_PATH) $< > $@
-
-.ELSE
-
 $(BOOTSTRAPMK) :
-    (echo '#include "macro.hxx"'; echo RTL_OS:=THIS_OS; echo RTL_ARCH:=THIS_ARCH) | $(CC) -E $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CDEFS) $(CFLAGSAPPEND) - | grep '^RTL_' | sed -e 's/"//g' >$@ 
-
-.ENDIF
+    (echo '#include "macro.hxx"'; echo RTL_OS:=THIS_OS; echo RTL_ARCH:=THIS_ARCH) >$(BOOTSTRAPMK).c
+    $(CC) -E $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(BOOTSTRAPMK).c | $(GREP) '^RTL_' | $(SED) -e 's/"//g' >$@