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

Move libBrowser to a dedicated directory

Browse Source
This commit is contained in:
Pierre Pronchery 2016-10-09 03:03:36 +02:00
parent 8451b096b6
commit 176bbfe6ed
6 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/vfs.c → src/lib/vfs.c
View File

@ -36,7 +36,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <libgen.h> #include <libgen.h>
#include "../include/Browser/vfs.h" #include "../../include/Browser/vfs.h"
/* public */ /* public */

4
src/plugins/project.conf
View File

@ -25,7 +25,7 @@ depends=common.c,../../include/Browser.h
[dirtree] [dirtree]
type=plugin type=plugin
sources=dirtree.c sources=dirtree.c
ldflags=-L$(OBJDIR).. -Wl,-rpath,$(LIBDIR) -lBrowser ldflags=-L$(OBJDIR)../lib -Wl,-rpath,$(LIBDIR) -lBrowser
install=$(LIBDIR)/Browser/plugins install=$(LIBDIR)/Browser/plugins
[dirtree.c] [dirtree.c]
@ -34,7 +34,7 @@ depends=../../include/Browser.h
[favorites] [favorites]
type=plugin type=plugin
sources=favorites.c sources=favorites.c
ldflags=-L$(OBJDIR).. -Wl,-rpath,$(LIBDIR) -lBrowser ldflags=-L$(OBJDIR)../lib -Wl,-rpath,$(LIBDIR) -lBrowser
install=$(LIBDIR)/Browser/plugins install=$(LIBDIR)/Browser/plugins
[favorites.c] [favorites.c]

25
src/project.conf
View File

@ -1,4 +1,5 @@
targets=libBrowser,browser,copy,delete,desktop,desktopctl,move,open,properties,view subdirs=lib
targets=browser,copy,delete,desktop,desktopctl,move,open,properties,view
#cppflags=-D EMBEDDED #cppflags=-D EMBEDDED
cflags_force=`pkg-config --cflags libDesktop` cflags_force=`pkg-config --cflags libDesktop`
cflags=-W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all cflags=-W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all
@ -6,18 +7,12 @@ ldflags_force=`pkg-config --libs libDesktop` -lintl
ldflags=-Wl,-z,relro -Wl,-z,now ldflags=-Wl,-z,relro -Wl,-z,now
dist=Makefile,browser.h,callbacks.h,common.c,common.h,desktop.h,desktopicon.h,desktopiconwindow.h,window.h dist=Makefile,browser.h,callbacks.h,common.c,common.h,desktop.h,desktopicon.h,desktopiconwindow.h,window.h
[libBrowser]
type=library
sources=vfs.c
cflags=-fPIC
install=$(LIBDIR)
[browser] [browser]
type=binary type=binary
depends=$(OBJDIR)libBrowser$(SOEXT) depends=$(OBJDIR)lib/libBrowser.a
sources=browser.c,callbacks.c,window.c,main.c sources=browser.c,callbacks.c,window.c,main.c
cflags=-fPIE cflags=-fPIE
ldflags=-L$(OBJDIR). -Wl,-rpath,$(LIBDIR) -lBrowser -pie ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser -pie
install=$(BINDIR) install=$(BINDIR)
[browser.c] [browser.c]
@ -49,10 +44,10 @@ install=$(BINDIR)
[desktop] [desktop]
type=binary type=binary
depends=$(OBJDIR)libBrowser$(SOEXT) depends=$(OBJDIR)lib/libBrowser.a
sources=desktop.c,desktopicon.c,desktopiconwindow.c sources=desktop.c,desktopicon.c,desktopiconwindow.c
cflags=`pkg-config --cflags x11 xrandr` -fPIE cflags=`pkg-config --cflags x11 xrandr` -fPIE
ldflags=`pkg-config --libs x11 xrandr` -L$(OBJDIR). -Wl,-rpath,$(LIBDIR) -lBrowser -pie ldflags=`pkg-config --libs x11 xrandr` -L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser -pie
install=$(BINDIR) install=$(BINDIR)
[desktop.c] [desktop.c]
@ -92,10 +87,10 @@ install=$(BINDIR)
[properties] [properties]
type=binary type=binary
depends=$(OBJDIR)libBrowser$(SOEXT) depends=$(OBJDIR)lib/libBrowser.a
sources=properties.c sources=properties.c
cflags=-fPIE cflags=-fPIE
ldflags=-L$(OBJDIR). -Wl,-rpath,$(LIBDIR) -lBrowser -pie ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser -pie
install=$(BINDIR) install=$(BINDIR)
[properties.c] [properties.c]
@ -104,10 +99,10 @@ cppflags=-D PREFIX=\"$(PREFIX)\"
[view] [view]
type=binary type=binary
depends=$(OBJDIR)libBrowser$(SOEXT) depends=$(OBJDIR)lib/libBrowser.a
sources=view.c sources=view.c
cflags=-fPIE cflags=-fPIE
ldflags=-L$(OBJDIR). -Wl,-rpath,$(LIBDIR) -lBrowser -pie ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser -pie
install=$(BINDIR) install=$(BINDIR)
[view.c] [view.c]

2
src/widget/project.conf
View File

@ -1,7 +1,7 @@
targets=browser targets=browser
cflags_force=`pkg-config --cflags libDesktop` -fPIC cflags_force=`pkg-config --cflags libDesktop` -fPIC
cflags=-W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all cflags=-W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all
ldflags_force=`pkg-config --libs libDesktop` -lintl -L$(OBJDIR).. -Wl,-rpath,$(LIBDIR) -lBrowser ldflags_force=`pkg-config --libs libDesktop` -lintl -L$(OBJDIR)../lib -Wl,-rpath,$(LIBDIR) -lBrowser
ldflags=-Wl,-z,relro -Wl,-z,now ldflags=-Wl,-z,relro -Wl,-z,now
dist=Makefile dist=Makefile

2
tests/project.conf
View File

@ -12,7 +12,7 @@ sources=plugins.c
[vfs] [vfs]
type=binary type=binary
ldflags=-L$(OBJDIR)../src -Wl,-rpath,../src -lBrowser ldflags=-L$(OBJDIR)../src/lib -Wl,-rpath,../src -lBrowser
sources=vfs.c sources=vfs.c
[tests.log] [tests.log]

2
tests/tests.sh
View File

@ -54,7 +54,7 @@ _run()
echo -n "$test:" 1>&2 echo -n "$test:" 1>&2
(echo (echo
echo "Testing: $OBJDIR$test" "$@" echo "Testing: $OBJDIR$test" "$@"
LD_LIBRARY_PATH="$OBJDIR../src" "$OBJDIR$test" "$@") >> "$target" 2>&1 LD_LIBRARY_PATH="$OBJDIR../src/lib" "$OBJDIR$test" "$@") >> "$target" 2>&1
res=$? res=$?
if [ $res -ne 0 ]; then if [ $res -ne 0 ]; then
echo " FAIL (error $res)" echo " FAIL (error $res)"