369308b737
Ok - so one of the steps in building CDE is an early phase called the includes phase (make includes). At this point, all of the public header files are exported to exports/include/Dt, DtI, ... Then, the software is built using that include dir. This of course does not work in autotools. Much of the software does things like #include <Dt/something.h>, so in order for the build to succeed, this behavior must be represented/replicated in some way. It seems the usual way of dealing with this is to place all public headers (and in some projects, ALL headers) into a toplevel include directory. We now do this for all public headers - they have been moved from wherever they were and placed in the appropriate spot in includes/ This will break the Imake 'make includes' phase unless the Imakefiles are fixed (remove the HEADERS = stuff, and the incdir defines). This has not been done at this point since in reality, once autotools works properly, there will be no need for the Imake stuff anymore, and I intend to get rid of it. This is just a warning for now - Imake builds in this tree will now fail at the 'includes' stage. This commit is only the migration. In upcoming commits, libtt will be fixed so that the hack being used before to get around this problem is removed as there will no longer be any need. And then the autotools work continues...
119 lines
3.9 KiB
C
119 lines
3.9 KiB
C
/*
|
|
* CDE - Common Desktop Environment
|
|
*
|
|
* Copyright (c) 1993-2012, The Open Group. All rights reserved.
|
|
*
|
|
* These libraries and programs are free software; you can
|
|
* redistribute them and/or modify them under the terms of the GNU
|
|
* Lesser General Public License as published by the Free Software
|
|
* Foundation; either version 2 of the License, or (at your option)
|
|
* any later version.
|
|
*
|
|
* These libraries and programs are distributed in the hope that
|
|
* they 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 for more
|
|
* details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with these libraries and programs; if not, write
|
|
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
|
|
* Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
/* $XConsortium: HelpP.h /main/3 1995/10/26 12:24:50 rswiston $ */
|
|
/************************************<+>*************************************
|
|
****************************************************************************
|
|
**
|
|
** File: HelpP.h
|
|
**
|
|
** Project: CacheCreeek (Rivers) Project.
|
|
**
|
|
**
|
|
** Description: Private header file for Dts.
|
|
**
|
|
**
|
|
** (c) Copyright 1987, 1988, 1989, 1990, 1991, 1992 Hewlett-Packard Company
|
|
**
|
|
** (c) Copyright 1993, 1994 Hewlett-Packard Company
|
|
** (c) Copyright 1993, 1994 International Business Machines Corp.
|
|
** (c) Copyright 1993, 1994 Sun Microsystems, Inc.
|
|
** (c) Copyright 1993, 1994 Novell, Inc.
|
|
**
|
|
**
|
|
**
|
|
****************************************************************************
|
|
************************************<+>*************************************/
|
|
#ifndef _DtHelpP_h
|
|
#define _DtHelpP_h
|
|
|
|
/* Privite Argument Resource Definitions for Help Widget */
|
|
|
|
#define DtNshowTopLevelButton "showTopLevelButton"
|
|
#ifndef XmNshowTopLevelButton
|
|
#define XmNshowTopLevelButton DtNshowTopLevelButton
|
|
#endif
|
|
#define DtCShowTopLevelButton "ShowTopLevelButton"
|
|
#ifndef XmCShowTopLevelButton
|
|
#define XmCShowTopLevelButton DtCShowTopLevelButton
|
|
#endif
|
|
|
|
#define DtNsrchHitPrefixFont "srchHitPrefixFont"
|
|
#ifndef XmNsrchHitPrefixFont
|
|
#define XmNsrchHitPrefixFont DtNsrchHitPrefixFont
|
|
#endif
|
|
#define DtCSrchHitPrefixFont "SrchHitPrefixFont"
|
|
#ifndef XmCSrchHitPrefixFont
|
|
#define XmCSrchHitPrefixFont DtCSrchHitPrefixFont
|
|
#endif
|
|
|
|
|
|
#ifndef CDE_CONFIGURATION_TOP
|
|
#define CDE_CONFIGURATION_TOP "/etc/dt"
|
|
#endif
|
|
|
|
#ifndef CDE_INSTALLATION_TOP
|
|
#define CDE_INSTALLATION_TOP "/usr/dt"
|
|
#endif
|
|
|
|
|
|
#define DtDEFAULT_SYSTEM_PATH \
|
|
CDE_CONFIGURATION_TOP "/appconfig/help/%L/%H:" \
|
|
CDE_CONFIGURATION_TOP "/appconfig/help/%L/%H.sdl:" \
|
|
CDE_CONFIGURATION_TOP "/appconfig/help/%L/%H.hv:" \
|
|
CDE_CONFIGURATION_TOP "/appconfig/help/C/%H:" \
|
|
CDE_CONFIGURATION_TOP "/appconfig/help/C/%H.sdl:" \
|
|
CDE_CONFIGURATION_TOP "/appconfig/help/C/%H.hv:" \
|
|
CDE_INSTALLATION_TOP "/appconfig/help/%L/%H:" \
|
|
CDE_INSTALLATION_TOP "/appconfig/help/%L/%H.sdl:" \
|
|
CDE_INSTALLATION_TOP "/appconfig/help/%L/%H.hv" \
|
|
CDE_INSTALLATION_TOP "/appconfig/help/C/%H:" \
|
|
CDE_INSTALLATION_TOP "/appconfig/help/C/%H.sdl:" \
|
|
CDE_INSTALLATION_TOP "/appconfig/help/C/%H.hv:"
|
|
|
|
|
|
#define DtDEFAULT_USER_PATH_FORMAT \
|
|
"%s/.dt/help/%s/%%H:" \
|
|
"%s/.dt/help/%s/%%H.sdl:" \
|
|
"%s/.dt/help/%s/%%H.hv:" \
|
|
"%s/.dt/help/%%H:" \
|
|
"%s/.dt/help/%%H.sdl:" \
|
|
"%s/.dt/help/%%H.hv"
|
|
|
|
/* this path expects a sprintf usage as follows:
|
|
sprintf(buf,DtDEFAULT_USER_PATH_FORMAT,
|
|
homedir, dtusersessionname,
|
|
homedir, dtusersessionname,
|
|
homedir, dtusersessionname,
|
|
homedir, homedir, homedir);
|
|
*/
|
|
|
|
/* #define DtVOLUMES_TYPE "volumes" */
|
|
|
|
#endif /* _DtHelpP_h */
|
|
/* DON'T ADD ANYTHING AFTER THIS #endif */
|
|
|
|
|
|
|
|
|
|
|