Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 4820 → Rev 4821

/contrib/network/netsurf/libdom/Makefile
5,7 → 5,8
COMPONENT_TYPE ?= lib-static
 
# Setup the tooling
PREFIX ?= /opt/netsurf
#PREFIX ?= /opt/netsurf
PREFIX ?= /usr
NSSHARED ?= $(PREFIX)/share/netsurf-buildsystem
include $(NSSHARED)/makefiles/Makefile.tools
 
23,7 → 24,10
ifeq ($(TARGET),amiga)
CFLAGS := -U__STRICT_ANSI__ $(CFLAGS)
endif
CFLAGS := -D_BSD_SOURCE -I$(CURDIR)/include/ \
 
 
 
CFLAGS := -D_BSD_SOURCE -I$(CURDIR)/include/ -I$(CURDIR)/../libwapcaplet/include/ \
-I$(CURDIR)/src -I$(CURDIR)/binding $(WARNFLAGS) $(CFLAGS)
# Some gcc2 versions choke on -std=c99, and it doesn't know about it anyway
ifneq ($(GCCVER),2)
/contrib/network/netsurf/libdom/bindings/Makefile
1,3 → 1,8
# Bindings
# This is the makefile in kolibrios/contrib/network/netsurf/libcss
# Need to add recursive calling to all the subdirectories. For now, use the generated .a file for testing.
 
include $(NSBUILD)/Makefile.subdir
OUTFILE := $(CURDIR)/libhubbub.a
 
OBJS = $(wildcard hubbub/libo.o)
 
include $(MENUETDEV)/makefiles/Makefile_for_lib
/contrib/network/netsurf/libdom/bindings/hubbub/Makefile
4,5 → 4,5
 
OUTFILE = libo.o
 
CFLAGS += -I ./ -I ../../include/ -I ../../src/ -I ../../../libhubbub/include/ -I ../../../libwapcaplet/include/
CFLAGS += -I ./ -I ../../include/ -I ../../src/ -I ../../../libhubbub/include/ -I ../../../libwapcaplet/include/ -I ../../../libwapcaplet/include/
include $(MENUETDEV)/makefiles/Makefile_for_o_lib
/contrib/network/netsurf/libdom/bindings/hubbub/parser.c
10,9 → 10,9
#include <stdio.h>
#include <string.h>
 
#include "/home/sourcerer/kos_src/newenginek/kolibri/include/hubbub/errors.h"
#include "/home/sourcerer/kos_src/newenginek/kolibri/include/hubbub/hubbub.h"
#include "/home/sourcerer/kos_src/newenginek/kolibri/include/hubbub/parser.h"
#include "hubbub/errors.h"
#include "hubbub/hubbub.h"
#include "hubbub/parser.h"
 
#include <dom/dom.h>
 
/contrib/network/netsurf/libdom/include/dom/core/string.h
18,7 → 18,7
typedef struct dom_string dom_string;
extern struct dom_string {
uint32_t refcnt;
} _ALIGNED;
}; //_ALIGNED;
 
 
/* Claim a reference on a DOM string */
/contrib/network/netsurf/libdom/src/Makefile
1,3 → 1,17
# This is the makefile in kolibrios/contrib/network/netsurf/libdom/src
# Need to add recursive calling to all the subdirectories. For now, use the generated .a file for testing.
 
OUTFILE := $(CURDIR)/libdom.a
 
OBJS = $(wildcard core/libo.o)
OBJS := $(OBJS) $(wildcard events/libo.o)
OBJS := $(OBJS) $(wildcard html/libo.o)
OBJS := $(OBJS) $(wildcard utils/libo.o)
OBJS := $(OBJS) $(wildcard ../bindings/hubbub/libo.o)
 
include $(MENUETDEV)/makefiles/Makefile_for_lib
 
# Contents before above changes were added:
# Src
 
include $(NSBUILD)/Makefile.subdir
#NSBUILD ?= /usr/share/netsurf-buildsystem/makefiles
#include $(NSBUILD)/Makefile.subdir
/contrib/network/netsurf/libdom/src/core/Makefile
11,5 → 11,5
 
OUTFILE = libo.o
 
CFLAGS += -I ../../include/ -I ../../ -I ../ -I ./ -I /home/sourcerer/kos_src/newenginek/kolibri/include
CFLAGS += -I ../../include/ -I ../../ -I ../ -I ./ -I /home/sourcerer/kos_src/newenginek/kolibri/include -I ../../../libwapcaplet/include/ -I ../../../libparserutils/include/
include $(MENUETDEV)/makefiles/Makefile_for_o_lib
/contrib/network/netsurf/libdom/src/events/Makefile
6,5 → 6,5
 
OUTFILE = libo.o
 
CFLAGS += -I ../../include/ -I ../../ -I ../ -I ./ -I /home/sourcerer/kos_src/newenginek/kolibri/include
CFLAGS += -I ../../include/ -I ../../ -I ../ -I ./ -I /home/sourcerer/kos_src/newenginek/kolibri/include -I ../../../libwapcaplet/include/ -I ../../../libparserutils/include/
include $(MENUETDEV)/makefiles/Makefile_for_o_lib
/contrib/network/netsurf/libdom/src/html/Makefile
25,6 → 25,6
 
OUTFILE = libo.o
 
CFLAGS += -I ../../include/ -I ../../ -I ../ -I ./ -I /home/sourcerer/kos_src/newenginek/kolibri/include
CFLAGS += -I ../../include/ -I ../../ -I ../ -I ./ -I /home/sourcerer/kos_src/newenginek/kolibri/include -I ../../../libwapcaplet/include/ -I ../../../libparserutils/include/
include $(MENUETDEV)/makefiles/Makefile_for_o_lib
 
/contrib/network/netsurf/libdom/src/utils/Makefile
3,6 → 3,6
 
OUTFILE = libo.o
 
CFLAGS += -I ../../include/ -I ../../ -I ../ -I ./ -I /home/sourcerer/kos_src/newenginek/kolibri/include
CFLAGS += -I ../../include/ -I ../../ -I ../ -I ./ -I /home/sourcerer/kos_src/newenginek/kolibri/include -I ../../../libwapcaplet/include/ -I ../../../libparserutils/include/
include $(MENUETDEV)/makefiles/Makefile_for_o_lib