DeforaOS/Surfer
DeforaOS/Surfer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed "make distcheck"

Browse Source
This commit is contained in:
Pierre Pronchery 2014-12-24 19:15:45 +01:00
parent 454a88a0c7
commit 7f465388ed
4 changed files with 53 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -72,6 +72,7 @@ dist:
$(PACKAGE)-$(VERSION)/src/common/history.c \
$(PACKAGE)-$(VERSION)/src/common/url.c \
$(PACKAGE)-$(VERSION)/src/common/project.conf \
$(PACKAGE)-$(VERSION)/tools/ghtml-helper.c \
$(PACKAGE)-$(VERSION)/tools/helper.c \
$(PACKAGE)-$(VERSION)/tools/Makefile \
$(PACKAGE)-$(VERSION)/tools/project.conf \

15
tools/Makefile
View File

@ -9,7 +9,7 @@ CPPFLAGSF= -I ../src
CPPFLAGS=
CFLAGSF = -W `pkg-config --cflags libDesktop`
CFLAGS = -Wall -g -O2 -pedantic
LDFLAGS =
LDFLAGS = `pkg-config --libs libDesktop`
RM = rm -f
LN = ln -f
MKDIR = mkdir -m 0755 -p
@ -18,14 +18,17 @@ INSTALL = install
all: $(TARGETS)
helper_OBJS = $(OBJDIR)helper.o
helper_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
helper_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libDesktop webkit-1.0` ../src/ghtml.o
helper_OBJS = $(OBJDIR)ghtml-helper.o $(OBJDIR)helper.o
helper_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags webkit-1.0`
helper_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs webkit-1.0`
$(OBJDIR)helper: $(helper_OBJS) ../src/ghtml.o
$(OBJDIR)helper: $(helper_OBJS)
$(CC) -o $(OBJDIR)helper $(helper_OBJS) $(helper_LDFLAGS)
$(OBJDIR)helper.o: helper.c ../src/common/find.c ../src/ghtml.c ../src/surfer.h ../config.h
$(OBJDIR)ghtml-helper.o: ghtml-helper.c ../src/ghtml.h ../src/ghtml.c
$(CC) -D WITH_WEBKIT $(helper_CFLAGS) -o $(OBJDIR)ghtml-helper.o -c ghtml-helper.c
$(OBJDIR)helper.o: helper.c ../src/common/find.c ../src/surfer.h ../config.h
$(CC) -D WITH_WEBKIT $(helper_CFLAGS) -o $(OBJDIR)helper.o -c helper.c
clean:

18
tools/ghtml-helper.c Normal file
View File

@ -0,0 +1,18 @@
/* $Id$ */
/* Copyright (c) 2014 Pierre Pronchery <khorben@defora.org> */
/* This file is part of DeforaOS Desktop Surfer */
/* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, version 3 of the License.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "../src/ghtml.c"

34
tools/project.conf
View File

@ -3,23 +3,39 @@ cppflags_force=-I ../src
#cppflags=-D EMBEDDED
cflags_force=-W `pkg-config --cflags libDesktop`
cflags=-Wall -g -O2 -pedantic
ldflags=
ldflags=`pkg-config --libs libDesktop`
dist=Makefile
[helper]
type=binary
#ldflags=`pkg-config --libs libDesktop mozilla-gtkmozembed` ../src/ghtml.o
#ldflags=`pkg-config --libs libDesktop libgtkhtml-2.0 gnet-2.0` ../src/ghtml.o
#ldflags=`pkg-config --libs libParser libDesktop gnet-2.0` ../src/ghtml.o
ldflags=`pkg-config --libs libDesktop webkit-1.0` ../src/ghtml.o
#ldflags=`pkg-config --libs libDesktop webkitgtk-3.0` ../src/ghtml.o
sources=helper.c
depends=../src/ghtml.o
#GtkMozEmbed
#cflags=`pkg-config --libs mozilla-gtkmozembed`
#ldflags=`pkg-config --libs mozilla-gtkmozembed`
#libgtkhtml2
#ldflags=`pkg-config --cflags libgtkhtml-2.0 gnet-2.0`
#ldflags=`pkg-config --libs libgtkhtml-2.0 gnet-2.0`
#libParser
#ldflags=`pkg-config --cflags libParser gnet-2.0`
#ldflags=`pkg-config --libs libParser gnet-2.0`
#WebKit/Gtk+ 2
cflags=`pkg-config --cflags webkit-1.0`
ldflags=`pkg-config --libs webkit-1.0`
#WebKit/Gtk+ 3
#ldflags=`pkg-config --cflags webkitgtk-3.0`
#ldflags=`pkg-config --libs webkitgtk-3.0`
sources=ghtml-helper.c,helper.c
install=$(BINDIR)
[ghtml-helper.c]
#cppflags=-D WITH_GTKMOZEMBED
#cppflags=-D WITH_GTKHTML
#cppflags=-D WITH_GTKTEXTVIEW
cppflags=-D WITH_WEBKIT
depends=../src/ghtml.h,../src/ghtml.c
[helper.c]
#cppflags=-D WITH_GTKMOZEMBED
#cppflags=-D WITH_GTKHTML
#cppflags=-D WITH_GTKTEXTVIEW
cppflags=-D WITH_WEBKIT
depends=../src/common/find.c,../src/ghtml.c,../src/surfer.h,../config.h
depends=../src/common/find.c,../src/surfer.h,../config.h