diff --git a/data/Panel.pc.in b/data/Panel.pc.in index 72134eb..093dc1d 100644 --- a/data/Panel.pc.in +++ b/data/Panel.pc.in @@ -6,6 +6,6 @@ libdir=${exec_prefix}/lib Name: Panel Description: DeforaOS Desktop Panel applets Version: @VERSION@ -Requires: gtk+-2.0 +Requires: libDesktop Cflags: -I${includedir} Libs: -Wl,-rpath-link,${libdir} -Wl,-rpath,${libdir} -L${libdir} -lPanel diff --git a/src/applets/project.conf b/src/applets/project.conf index ae71d1a..dfdc425 100644 --- a/src/applets/project.conf +++ b/src/applets/project.conf @@ -3,12 +3,8 @@ cppflags_force=-I ../../include #cppflags=-D EMBEDDED cflags=-W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector ldflags= -#for Gtk+ 2 -#cflags_force=`pkg-config --cflags libSystem gtk+-2.0` -fPIC -#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).. +cflags_force=-W `pkg-config --cflags libDesktop` -fPIC +ldflags_force=`pkg-config --libs libDesktop` -lPanel -L$(OBJDIR).. dist=Makefile,tasks.atoms [battery] diff --git a/src/project.conf b/src/project.conf index d012ff7..20a0349 100644 --- a/src/project.conf +++ b/src/project.conf @@ -45,10 +45,6 @@ depends=../include/Panel.h,panel.h,../config.h type=binary sources=run.c cppflags=-D PREFIX=\"$(PREFIX)\" -#for Gtk+ 2 -#cflags=`pkg-config --cflags libSystem gtk+-2.0` -fPIE -#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 +cflags=`pkg-config --cflags libDesktop` -fPIE +ldflags=`pkg-config --libs libDesktop` -lintl -pie install=$(BINDIR)