From 2acce94066bd19ee1f95d2442fdf204231253a7b Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Fri, 26 Oct 2018 01:05:11 -0300 Subject: [PATCH] Sort target definitions before sources --- src/desktop/project.conf | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/desktop/project.conf b/src/desktop/project.conf index e2a972f..d482346 100644 --- a/src/desktop/project.conf +++ b/src/desktop/project.conf @@ -6,6 +6,7 @@ ldflags_force=`pkg-config --libs libDesktop` -lintl ldflags=-pie -Wl,-z,relro -Wl,-z,now dist=Makefile,desktop.h,desktopicon.h,desktopiconwindow.h +#targets [desktop] type=binary depends=$(OBJDIR)../lib/libBrowser.a @@ -14,10 +15,19 @@ cflags=`pkg-config --cflags x11 xrandr` ldflags=`pkg-config --libs x11 xrandr` -L$(OBJDIR)../lib -Wl,-rpath,$(LIBDIR) -lBrowser install=$(BINDIR) +[desktopctl] +type=binary +sources=desktopctl.c +install=$(BINDIR) + +#sources [desktop.c] depends=../common.h,../common.c,desktopicon.h,desktop.h,../../config.h cppflags=-D PREFIX=\"$(PREFIX)\" +[desktopctl.c] +depends=desktop.h,../../config.h + [desktopicon.c] depends=../common.h,../common.c,desktop.h,desktopicon.h,../../config.h cppflags=-D PREFIX=\"$(PREFIX)\" @@ -25,13 +35,5 @@ cppflags=-D PREFIX=\"$(PREFIX)\" [desktopiconwindow.c] depends=../common.h,desktop.h,desktopicon.h,desktopiconwindow.h -[desktopctl] -type=binary -sources=desktopctl.c -install=$(BINDIR) - -[desktopctl.c] -depends=desktop.h,../../config.h - [main.c] depends=desktop.h,../../config.h