7 files changed, 89 insertions, 114 deletions
diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk
new file mode 100644
index 000000000000..a856cf7a4612
--- /dev/null
+++ b/idl/Executable_svidl.mk
@@ -0,0 +1,65 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Executable_Executable,svidl))
+
+$(eval $(call gb_Executable_set_include,svidl,\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc/ \
+	-I$(OUTDIR)/inc/offuh/ \
+	-I$(SRCDIR)/idl/inc/pch \
+	-I$(SRCDIR)/idl/inc \
+))
+
+$(eval $(call gb_Executable_add_defs,svidl,\
+	-DIDL_COMPILER \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,svidl,\
+	tl \
+	sal \
+	stl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,svidl,\
+	idl/source/cmptools/char \
+	idl/source/cmptools/hash \
+	idl/source/cmptools/lex \
+	idl/source/objects/basobj \
+	idl/source/objects/bastype \
+	idl/source/objects/module \
+	idl/source/objects/object \
+	idl/source/objects/slot \
+	idl/source/objects/types \
+	idl/source/prj/command \
+	idl/source/prj/database \
+	idl/source/prj/globals \
+	idl/source/prj/svidl \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/idl/source/cmptools/makefile.mk b/idl/Makefile
index bf53623dfd0d..a79aff831024 100755..100644
--- a/idl/source/cmptools/makefile.mk
+++ b/idl/Makefile
@@ -25,23 +25,14 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-PRJNAME=idl
-TARGET=cmptools
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
 
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CDEFS+=-DIDL_COMPILER
-# --- Files --------------------------------------------------------------
-
-OBJFILES=   $(OBJ)$/lex.obj          \
-            $(OBJ)$/char.obj         \
-            $(OBJ)$/hash.obj
-
-# --- Targets ------------------------------------------------------------
-
-.INCLUDE :  target.mk
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
+# vim: set noet sw=4 ts=4:
diff --git a/idl/source/objects/makefile.mk b/idl/Module_idl.mk
index e141d85540de..f23ac7f04d9a 100755..100644
--- a/idl/source/objects/makefile.mk
+++ b/idl/Module_idl.mk
@@ -25,26 +25,11 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
 
-PRJNAME=idl
-TARGET=objects
+$(eval $(call gb_Module_Module,idl))
 
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CDEFS+=-DIDL_COMPILER
-# --- Files --------------------------------------------------------------
-
-OBJFILES=   $(OBJ)$/bastype.obj      \
-            $(OBJ)$/basobj.obj       \
-            $(OBJ)$/types.obj        \
-            $(OBJ)$/object.obj       \
-            $(OBJ)$/slot.obj         \
-            $(OBJ)$/module.obj
-
-# --- Targets ------------------------------------------------------------
-
-.INCLUDE :  target.mk
+$(eval $(call gb_Module_add_targets,idl,\
+	Executable_svidl \
+))
 
+# vim: set noet sw=4 ts=4:
diff --git a/idl/prj/build.lst b/idl/prj/build.lst
index e5f36475eeed..92d343a24021 100644
--- a/idl/prj/build.lst
+++ b/idl/prj/build.lst
@@ -1,8 +1,2 @@
 id	idl	:	tools NULL
-id	idl										usr1	-	all	idl_mkout NULL
-id	idl\prj									get		-	all	idl_gprj NULL
-id	idl\inc									nmake	-	all	idl_inc NULL
-id	idl\source\cmptools						nmake	-	all	idl_cmp idl_inc NULL
-id	idl\source\objects						nmake	-	all	idl_obj idl_inc NULL
-id	idl\source\prj							nmake	-	all	idl_prj idl_inc NULL
-id	idl\util								nmake	-	all	idl_util idl_cmp idl_obj idl_prj NULL
+id	idl\prj									nmake	-	all	idl_gprj NULL
diff --git a/idl/prj/d.lst b/idl/prj/d.lst
index 9940b5c36aa3..e69de29bb2d1 100644
--- a/idl/prj/d.lst
+++ b/idl/prj/d.lst
@@ -1,2 +0,0 @@
-..\%__SRC%\bin\svidl.exe %_DEST%\bin\svidl.exe
-..\%__SRC%\bin\svidl %_DEST%\bin\svidl
diff --git a/idl/inc/makefile.mk b/idl/prj/makefile.mk
index 66b944a14867..88cd9dfe08b8 100755
--- a/idl/inc/makefile.mk
+++ b/idl/prj/makefile.mk
@@ -24,24 +24,17 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..
-
-PRJNAME=idl
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
 
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
+PRJ=..
+TARGET=prj
 
-.INCLUDE :  target.mk
+.INCLUDE : settings.mk
 
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
 
+all:
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/idl/util/idlpch.cxx b/idl/util/idlpch.cxx
deleted file mode 100644
index b32ec99901c9..000000000000
--- a/idl/util/idlpch.cxx
+++ /dev/null
@@ -1,51 +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_idl.hxx"
-#include <memory.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <limits.h>
-
-#include <tlbigint.hxx>
-#include <tlfsys.hxx>
-#include <char.hxx>
-#include <command.hxx>
-#include <hash.hxx>
-#include <lex.hxx>
-#include <attrib.hxx>
-#include <globals.hxx>
-#include <bastype.hxx>
-#include <object.hxx>
-#include <slot.hxx>
-#include <module.hxx>
-#include <database.hxx>
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */