Skip to content

GitLab

W
webkit
Commit b5125459 authored by kocienda's avatar kocienda
Browse files
Options

Moved the make system so that it no longer includes elements from 

the KDE build system. This involved removing the following files from
each directory where they appear in the KDE distribution:

	 - Makefile.am
	 - Makefile.in
	 - configure.in.in

I have also removed the special MakeSystemChanges.sh files from the tree
as they are made obsolete by this change.

It should also be noted that any Makefile.in files that remain are "ours"
and clobber the ones that KDE had.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@147 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent e3efb86f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 13648 deletions
JavaScriptCore/kjs/MakeSystemChanges.sh deleted 100644 → 0
View file @ e3efb86f
#!/bin/sh
FILES='configure.in.in Makefile.am Makefile.in'
for file in $FILES; do
if (test -f "$file"); then
A=`grep APPLE $file`
if (test -z "$A"); then
echo "Moving KDE build file $file..."
mv $file $file.kde
fi
fi
done
FILE=Makefile.in
if (! test -L "$FILE"); then
if (test -f "$FILE"); then
echo "Removing spurious $FILE..."
rm -f $file
fi
echo "Making link to Apple $FILE..."
ln -s $FILE.apple $FILE
fi
JavaScriptCore/kjs/Makefile.am deleted 100644 → 0
View file @ e3efb86f
# This file is part of the KDE libraries
# Copyright (C) 1999 Harri Porten (porten@kde.org)
# This 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; see the file COPYING.LIB. If not, write to
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
YACC = bison
INCLUDES = $(all_includes)
lib_LTLIBRARIES = libkjs.la
libkjs_la_SOURCES = kjs.cpp grammar.cpp lexer.cpp nodes.cpp object.cpp \
operations.cpp ustring.cpp function.cpp types.cpp lookup.cpp \
internal.cpp regexp.cpp global_object.cpp math_object.cpp \
bool_object.cpp object_object.cpp error_object.cpp \
array_object.cpp string_object.cpp number_object.cpp \
date_object.cpp regexp_object.cpp collector.cpp function_object.cpp \
debugger.cpp
kjsincludedir = $(includedir)/kjs
kjsinclude_HEADERS = kjs.h object.h operations.h ustring.h \
function.h lookup.h types.h
noinst_HEADERS = nodes.h lexer.h regexp.h internal.h collector.h \
grammar.h object_object.h function_object.h function_object.h \
bool_object.h math_object.h array_object.h string_object.h \
number_object.h date_object.h regexp_object.h error_object.h \
debugger.h
libkjs_la_LDFLAGS = -version-info 1:0 -no-undefined $(USER_LDFLAGS) $(all_libraries)
libkjs_la_LIBADD = -lm $(LIBPCRE)
parser: $(srcdir)/grammar.y
cd $(srcdir); \
$(YACC) -d -p kjsyy grammar.y && mv grammar.tab.c grammar.cpp; \
if test -f grammar.tab.h; then \
if cmp -s grammar.tab.h grammar.h; then rm -f grammar.tab.h; \
else mv grammar.tab.h grammar.h; fi \
else :; fi
## with debugger interface
debugger: $(libkjs_la_SOURCES) $(kjsinclude_HEADERS) $(noinst_HEADERS)
$(MAKE) DEFS="-DKJS_DEBUGGER $(DEFS)" libkjs.la
## test program (in one program for easier profiling/memory debugging)
EXTRA_PROGRAMS = testkjs_static
testkjs_static_SOURCES = testkjs.cpp $(libkjs_la_SOURCES)
testkjs_static_LDADD = $(LIBPCRE)
## test program (linked to libkjs)
check_PROGRAMS = testkjs
testkjs_SOURCES = testkjs.cpp
testkjs_LDADD = libkjs.la
JavaScriptCore/kjs/Makefile.in.apple deleted 100644 → 0
View file @ e3efb86f
#======================================================================
#
# Makefile
#
# $RCSfile$
# $Revision$
# $Author$
# $Date$
#
# Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
#======================================================================
# set top source dir relative to this directory
# include make vars boilerplate
#
TOPSRCDIR = ../../..
include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
CXXYACCOBJECTS = grammar.cpp grammar.h
CXXOBJECTS = \
array_object.o \
bool_object.o \
collector.o \
date_object.o \
debugger.o \
error_object.o \
function.o \
function_object.o \
global_object.o \
grammar.o \
internal.o \
kjs.o \
lexer.o \
lookup.o \
math_object.o \
nodes.o \
number_object.o \
object.o \
object_object.o \
operations.o \
regexp.o \
regexp_object.o \
string_object.o \
types.o \
ustring.o \
$(NULL)
PROGRAM = testkjs
OBJECTS = $(CXXYACCOBJECTS) $(CXXOBJECTS)
LIBRARY = libkjs.a
CLEAN_FILES = $(OBJECTS) \
grammar.h \
grammar.cpp \
grammar.cpp.h \
testkjs.o \
$(LIBRARY) \
$(PROGRAM) \
$(NULL)
#----------------------------------------------------------------------
# Set flags for this directory
YACCFLAGS = -d --output-file=grammar.cpp --name-prefix=kjsyy
#----------------------------------------------------------------------
# Set targets for this directory
all: $(OBJECTS) $(LIBRARY) $(PROGRAM)
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
$(PROGRAM): testkjs.o
$(CC) $< -o $@ -L. -lkjs
depend:
grammar.h: grammar.cpp.h
ln -s grammar.cpp.h grammar.h
#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
#======================================================================
# end
#======================================================================
JavaScriptCore/kjs/configure.in.in deleted 100644 → 0
View file @ e3efb86f
dnl KDE JavaScript specific configure tests
AC_CHECK_HEADERS(ieeefp.h float.h)
AC_CHECK_LIB(m, isinf, [
AC_DEFINE_UNQUOTED(HAVE_FUNC_ISINF, 1, [Define if you have isinf])
])
AC_CHECK_LIB(m, finite, [
AC_DEFINE_UNQUOTED(HAVE_FUNC_FINITE, 1, [Define if you have finite])
])
AC_CHECK_LIB(m, _finite, [
AC_DEFINE_UNQUOTED(HAVE_FUNC__FINITE, 1, [Define if you have _finite])
])
AC_CHECK_LIB(m, isnan, [
AC_DEFINE_UNQUOTED(HAVE_FUNC_ISNAN, 1, [Define if you have isnan])
])
AC_DEFUN(AC_CHECK_PCREPOSIX,
[
AC_MSG_CHECKING([for pcreposix])
AC_CACHE_VAL(ac_cv_have_pcreposix,
[
ac_save_libs="$LIBS"
KDE_FIND_PATH(pcre-config, PCRE_CONFIG, [${prefix}/bin /usr/local/bin /opt/local/bin], [PCRE_CONFIG="" ])
if test -n "$PCRE_CONFIG" && $PCRE_CONFIG --libs >/dev/null 2>&1; then
LIBS=`$PCRE_CONFIG --libs --libs-posix`
CPPFLAGS="$CPPFLAGS `$PCRE_CONFIG --cflags`"
else
LIBS="-lpcre -lpcreposix"
fi
ac_CPPFLAGS_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $all_includes"
ac_LDFLAGS_save="$LDFLAGS"
LDFLAGS="$LDFLAGS $all_libraries"
AC_TRY_LINK(
[#include <pcreposix.h>],
[regfree(0);],
[ac_cv_have_pcreposix="yes"],
[ac_cv_have_pcreposix="no"]
)
LIBS="$ac_save_libs"
LDFLAGS="$ac_LDFLAGS_save"
CPPFLAGS="$ac_CPPFLAGS_save"
])
AC_MSG_RESULT($ac_cv_have_pcreposix)
if test "$ac_cv_have_pcreposix" = "yes"; then
LIBPCRE="-lpcre -lpcreposix"
AC_DEFINE(HAVE_PCREPOSIX, 1, [Define if you have pcreposix libraries and header files.])
fi
])
AC_CHECK_PCREPOSIX
AC_SUBST(LIBPCRE)
WebCore/khtml/css/MakeSystemChanges.sh deleted 100644 → 0
View file @ e3efb86f
#!/bin/sh
FILES='Makefile.am css_extensionsimpl.cpp css_extensionsimpl.h'
for file in $FILES; do
if (test -f "$file"); then
A=`grep APPLE $file`
if (test -z "$A"); then
echo "Moving KDE build file $file..."
mv $file $file.kde
fi
fi
done
if (! test -L "Makefile.in"); then
echo "Making link to Apple Makefile.in..."
ln -s Makefile.in.apple Makefile.in
fi
WebCore/khtml/css/Makefile.am deleted 100644 → 0
View file @ e3efb86f
# This file is part of the KDE libraries
# Copyright (C) 1997 Martin Jones (mjones@kde.org)
# (C) 1997 Torben Weis (weis@kde.org)
# This 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; see the file COPYING.LIB. If not, write to
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
noinst_LTLIBRARIES = libkhtmlcss.la
libkhtmlcss_la_SOURCES = \
css_stylesheetimpl.cpp css_ruleimpl.cpp css_valueimpl.cpp \
cssparser.cpp cssstyleselector.cpp csshelper.cpp
#libkhtmlcss_la_LDFLAGS = -no-undefined
libkhtmlcss_la_METASOURCES = AUTO
noinst_HEADERS = \
css_extensionsimpl.h css_stylesheetimpl.h cssparser.h \
css_ruleimpl.h css_valueimpl.h \
cssstyleselector.h csshelper.h
INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
-I$(top_srcdir)/khtml -I$(top_srcdir)/khtml/misc -I$(top_srcdir)/khtml/css \
-I$(top_srcdir)/khtml/dom -I$(top_srcdir)/khtml/xml -I$(top_srcdir)/khtml/html \
-I$(top_srcdir)/libltdl -I$(top_srcdir) $(all_includes)
cssdir = $(kde_datadir)/khtml/css
css_DATA = html4.css
SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml
## generate lib documentation
srcdoc:
$(mkinstalldirs) $(SRCDOC_DEST)
kdoc -H -d $(SRCDOC_DEST) kdecore \
$(include_HEADERS) -lqt
WebCore/khtml/css/Makefile.in.apple deleted 100644 → 0
View file @ e3efb86f
#======================================================================
#
# Makefile
#
# $RCSfile$
# $Revision$
# $Author$
# $Date$
#
#======================================================================
# set top source dir relative to this directory
# include make vars boilerplate
#
TOPSRCDIR = ../../../..
include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
SOURCES = $(wildcard *.cpp)
HEADERS = $(wildcard *.h)
CXXOBJECTS = css_ruleimpl.o \
css_stylesheetimpl.o \
css_valueimpl.o \
csshelper.o \
cssparser.o \
cssstyleselector.o \
$(NULL)
VALUEFILES = \
cssvalues.c \
cssvalues.h \
cssvalues.gperf \
$(NULL)
PROPFILES = \
cssproperties.c \
cssproperties.h \
cssproperties.gperf \
$(NULL)
CFILES = $(VALUEFILES) $(PROPFILES)
OBJECTS = $(CXXOBJECTS)
LIBRARY = libkhtmlcss.a
CLEAN_FILES = $(OBJECTS) \
$(LIBRARY) \
$(CFILES) \
$(NULL)
#----------------------------------------------------------------------
# Set flags for this directory
CXXFLAGS = $(BASECXXFLAGS) \
-I$(TOPSRCDIR) \
-I$(TOPSRCDIR)/src/kwq \
-I$(TOPSRCDIR)/src/kwq/qt \
-I$(TOPSRCDIR)/src/kwq/dcop \
-I$(TOPSRCDIR)/src/kwq/kdecore \
-I$(TOPSRCDIR)/src/kwq/kdeui \
-I$(TOPSRCDIR)/src/kwq/kio \
-I$(TOPSRCDIR)/src/kwq/kparts \
-I../dom \
-I../html \
-I../misc \
-I../xml \
-I.. \
-I. \
$(NULL)
DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
all: $(CFILES) $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
$(VALUEFILES):
sh ./makevalues
$(PROPFILES):
sh ./makeprop
#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
#======================================================================
# end
#======================================================================
WebCore/khtml/css/css_extensionsimpl.cpp deleted 100644 → 0
View file @ e3efb86f
/**
* This file is part of the DOM implementation for KDE.
*
* (C) 1999 Lars Knoll (knoll@kde.org)
*
* This 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; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
* $Id$
*/
#include "DOMException.h"
#include "DOMString.h"
#include "CSS2AzimuthImpl.h"
using namespace DOM;
CSS2AzimuthImpl::CSS2AzimuthImpl(DocumentImpl *doc) : CSSValueImpl(doc)
{
}
CSS2AzimuthImpl::~CSS2AzimuthImpl()
{
}
unsigned short CSS2AzimuthImpl::azimuthType() const
{
}
DOMString CSS2AzimuthImpl::identifier() const
{
}
bool CSS2AzimuthImpl::behind() const
{
}
void CSS2AzimuthImpl::setAngleValue( const unsigned short &unitType, const float &floatValue )
{
}
float CSS2AzimuthImpl::getAngleValue( const unsigned short &unitType )
{
}
void CSS2AzimuthImpl::setIdentifier( const DOMString &identifier, const bool &behind )
{
}
#include "DOMException.h"
#include "DOMString.h"
#include "CSS2BackgroundPositionImpl.h"
CSS2BackgroundPositionImpl::CSS2BackgroundPositionImpl(DocumentImpl *doc) : CSSValueImpl(doc)
{
}
CSS2BackgroundPositionImpl::~CSS2BackgroundPositionImpl()
{
}
unsigned short CSS2BackgroundPositionImpl::horizontalType() const
{
}
unsigned short CSS2BackgroundPositionImpl::verticalType() const
{
}
DOMString CSS2BackgroundPositionImpl::horizontalIdentifier() const
{
}
DOMString CSS2BackgroundPositionImpl::verticalIdentifier() const
{
}
float CSS2BackgroundPositionImpl::getHorizontalPosition( const float &horizontalType )
{
}
float CSS2BackgroundPositionImpl::getVerticalPosition( const float &verticalType )
{
}
void CSS2BackgroundPositionImpl::setHorizontalPosition( const unsigned short &horizontalType, const float &value )
{
}
void CSS2BackgroundPositionImpl::setVerticalPosition( const unsigned short &verticalType, const float &value )
{
}
void CSS2BackgroundPositionImpl::setPositionIdentifier( const DOMString &horizontalIdentifier, const DOMString &verticalIdentifier )
{
}
#include "DOMException.h"
#include "CSS2BorderSpacingImpl.h"
CSS2BorderSpacingImpl::CSS2BorderSpacingImpl(DocumentImpl *doc) : CSSValueImpl(doc)
{
}
CSS2BorderSpacingImpl::~CSS2BorderSpacingImpl()
{
}
unsigned short CSS2BorderSpacingImpl::horizontalType() const
{
}
unsigned short CSS2BorderSpacingImpl::verticalType() const
{
}
float CSS2BorderSpacingImpl::getHorizontalSpacing( const float &horizontalType )
{
}
float CSS2BorderSpacingImpl::getVerticalSpacing( const float &verticalType )
{
}
void CSS2BorderSpacingImpl::setHorizontalSpacing( const unsigned short &horizontalType, const float &value )
{
}
void CSS2BorderSpacingImpl::setVerticalSpacing( const unsigned short &verticalType, const float &value )
{
}
void CSS2BorderSpacingImpl::setInherit()( )
{
}
#include "DOMException.h"
#include "DOMString.h"
#include "CSS2CounterIncrementImpl.h"
CSS2CounterIncrementImpl::CSS2CounterIncrementImpl(DocumentImpl *doc)
{
}
CSS2CounterIncrementImpl::~CSS2CounterIncrementImpl()
{
}
short CSS2CounterIncrementImpl::increment() const
{
}
void CSS2CounterIncrementImpl::setIncrement( const short & )
{
}
#include "DOMException.h"
#include "DOMString.h"
#include "CSS2CounterResetImpl.h"
CSS2CounterResetImpl::CSS2CounterResetImpl(DocumentImpl *doc)
{
}
CSS2CounterResetImpl::~CSS2CounterResetImpl()
{
}
short CSS2CounterResetImpl::reset() const
{
}