[Pkg-corba-commits] r65 - in /trunk/omniorb4: debian/changelog debian/omniorb4.install include/omniconfig.h.in mk/beforeauto.mk.in src/tool/ src/tool/dir.mk
tgg at users.alioth.debian.org
tgg at users.alioth.debian.org
Wed Nov 28 22:04:21 UTC 2007
Author: tgg
Date: Wed Nov 28 22:04:21 2007
New Revision: 65
URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=65
Log:
revert the part compiling, using and shipping omkdepend
Added:
trunk/omniorb4/include/omniconfig.h.in
trunk/omniorb4/src/tool/
trunk/omniorb4/src/tool/dir.mk
Modified:
trunk/omniorb4/debian/changelog
trunk/omniorb4/debian/omniorb4.install
trunk/omniorb4/mk/beforeauto.mk.in
Modified: trunk/omniorb4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/changelog?rev=65&op=diff
==============================================================================
--- trunk/omniorb4/debian/changelog (original)
+++ trunk/omniorb4/debian/changelog Wed Nov 28 22:04:21 2007
@@ -1,4 +1,4 @@
-omniorb4 (4.1.1-1) UNRELEASED; urgency=low
+omniorb4 (4.1.1-1) unstable; urgency=low
[ Thomas Girard ]
* Move omnicpp man page to section 1.
@@ -8,14 +8,9 @@
* No longer modify configure.ac and configure, upstream caters for
kfreebsd now. Thanks to Duncan Grisby for accepting the patch.
* No longer create omniNames.html, shipped by upstream now.
- * No longer change include/omniconfig.h.in.
- * mk/beforeauto.mk.in: Use upstream's MKDIRHIER and OMKDEPEND, there is no
- rationale in the Debian changelog to change it and I prefer a minimal diff
- with upstream.
* Bump shlibs version for libomniorb4-1 and libcos4-1 to 4.1.1 due to
ABI change in the internal header files (which are used by
python-omniorb and omnievents).
- * Add omkdepend binary (Closes #277627).
-- Floris Bruynooghe <floris.bruynooghe at gmail.com> Mon, 26 Nov 2007 00:44:09 +0000
Modified: trunk/omniorb4/debian/omniorb4.install
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/omniorb4.install?rev=65&op=diff
==============================================================================
--- trunk/omniorb4/debian/omniorb4.install (original)
+++ trunk/omniorb4/debian/omniorb4.install Wed Nov 28 22:04:21 2007
@@ -3,4 +3,3 @@
usr/bin/genior
usr/bin/nameclt
usr/bin/omniMapper
-usr/bin/omkdepend
Added: trunk/omniorb4/include/omniconfig.h.in
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/include/omniconfig.h.in?rev=65&op=file
==============================================================================
--- trunk/omniorb4/include/omniconfig.h.in (added)
+++ trunk/omniorb4/include/omniconfig.h.in Wed Nov 28 22:04:21 2007
@@ -1,0 +1,48 @@
+/* -*- Mode: C++; -*-
+ * Package : omniORB
+ * omniconfig.h.in Created on: 2002/07/11
+ * Author : Duncan Grisby (dgrisby)
+ *
+ * Copyright (C) 2002 Duncan Grisby
+ *
+ * This file is part of the omniORB library
+ *
+ * The omniORB library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA
+ *
+ *
+ * Description:
+ * *** PROPRIETARY INTERFACE ***
+ *
+ * omniconfig.h used when using autoconf. Nothing in this file is
+ * replaced by autoconf, but the copying of this file over the
+ * non-autoconf version selects the autoconf setup.
+ */
+
+#ifndef __omniconfig_h__
+#define __omniconfig_h__
+
+#include <omniORB4/acconfig.h>
+
+#define @PLATFORM_DEFINE@ 1
+#define __OSVERSION__ @OSVERSION@
+
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+
+#endif
Modified: trunk/omniorb4/mk/beforeauto.mk.in
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/mk/beforeauto.mk.in?rev=65&op=diff
==============================================================================
--- trunk/omniorb4/mk/beforeauto.mk.in (original)
+++ trunk/omniorb4/mk/beforeauto.mk.in Wed Nov 28 22:04:21 2007
@@ -675,17 +675,16 @@
CC = @CC@
CXX = @CXX@
RANLIB = @RANLIB@
-MKDIRHIER = $(BASE_OMNI_TREE)/bin/scripts/omkdirhier
+MKDIRHIER = mkdir -p
INSTLIBFLAGS = -m 0644
INSTEXEFLAGS = -m 0755
CP = cp
MV = mv -f
CPP = @CPP@
-OMKDEPEND = $(TOOLBINDIR)/omkdepend
RMDIRHIER = $(RM) -rf
-CXXMAKEDEPEND = $(OMKDEPEND) -D__cplusplus
-CMAKEDEPEND = $(OMKDEPEND)
+CXXMAKEDEPEND = @CXX@ -M -MD -MG
+CMAKEDEPEND = @CC@ -M -MD -MG
#
@@ -737,8 +736,6 @@
#
ifdef Compiler_GCC
-CMAKEDEPEND += -D__GNUC__
-CXXMAKEDEPEND += -D__GNUG__ -D__GNUC__
CXXOPTIONS = -Wall -Wno-unused -fexceptions @EXTRA_GCC_CXXFLAGS@
EgcsMajorVersion = 1
EgcsMinorVersion = 1
Added: trunk/omniorb4/src/tool/dir.mk
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/src/tool/dir.mk?rev=65&op=file
==============================================================================
--- trunk/omniorb4/src/tool/dir.mk (added)
+++ trunk/omniorb4/src/tool/dir.mk Wed Nov 28 22:04:21 2007
@@ -1,0 +1,27 @@
+# Check for Python and complain early
+ifndef PYTHON
+all::
+ @$(NoPythonError)
+export::
+ @$(NoPythonError)
+endif
+
+ifdef UnixPlatform
+SUBDIRS = omniidl
+endif
+
+ifdef Win32Platform
+SUBDIRS = omniidl
+endif
+
+
+all::
+ @$(MakeSubdirs)
+
+export::
+ @$(MakeSubdirs)
+
+ifdef INSTALLTARGET
+install::
+ @$(MakeSubdirs)
+endif
More information about the Pkg-corba-commits
mailing list