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

Depend on libDesktop instead of Gtk+ 2 or 3

Browse Source 
This will simplify configuration greatly.
This commit is contained in:
Pierre Pronchery 2020-09-11 00:24:39 +02:00
parent 7d33ccf1fb
commit b0afc90b95
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/Panel.pc.in
View File

@ -6,6 +6,6 @@ libdir=${exec_prefix}/lib
Name: Panel Name: Panel
Description: DeforaOS Desktop Panel applets Description: DeforaOS Desktop Panel applets
Version: @VERSION@ Version: @VERSION@
Requires: gtk+-2.0 Requires: libDesktop
Cflags: -I${includedir} Cflags: -I${includedir}
Libs: -Wl,-rpath-link,${libdir} -Wl,-rpath,${libdir} -L${libdir} -lPanel Libs: -Wl,-rpath-link,${libdir} -Wl,-rpath,${libdir} -L${libdir} -lPanel

8
src/applets/project.conf
View File

@ -3,12 +3,8 @@ cppflags_force=-I ../../include
#cppflags=-D EMBEDDED #cppflags=-D EMBEDDED
cflags=-W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector cflags=-W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector
ldflags= ldflags=
#for Gtk+ 2 cflags_force=-W `pkg-config --cflags libDesktop` -fPIC
#cflags_force=`pkg-config --cflags libSystem gtk+-2.0` -fPIC ldflags_force=`pkg-config --libs libDesktop` -lPanel -L$(OBJDIR)..
#ldflags_force=`pkg-config --libs libSystem gtk+-2.0` -lPanel -L$(OBJDIR)..
#for Gtk+ 3
cflags_force=-W `pkg-config --cflags libSystem gtk+-3.0` -fPIC
ldflags_force=`pkg-config --libs libSystem gtk+-3.0` -lPanel -L$(OBJDIR)..
dist=Makefile,tasks.atoms dist=Makefile,tasks.atoms
[battery] [battery]

8
src/project.conf
View File

@ -45,10 +45,6 @@ depends=../include/Panel.h,panel.h,../config.h
type=binary type=binary
sources=run.c sources=run.c
cppflags=-D PREFIX=\"$(PREFIX)\" cppflags=-D PREFIX=\"$(PREFIX)\"
#for Gtk+ 2 cflags=`pkg-config --cflags libDesktop` -fPIE
#cflags=`pkg-config --cflags libSystem gtk+-2.0` -fPIE ldflags=`pkg-config --libs libDesktop` -lintl -pie
#ldflags=`pkg-config --libs libSystem gtk+-2.0` -lintl -pie
#for Gtk+ 3
cflags=`pkg-config --cflags libSystem gtk+-3.0` -fPIE
ldflags=`pkg-config --libs libSystem gtk+-3.0` -lintl -pie
install=$(BINDIR) install=$(BINDIR)