blob: ee95b21486c1ae1c0903f2ae1d9a028a4bdbcf01 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
--- a/Makefile
+++ b/Makefile
@@ -19,14 +19,14 @@
MENUDIR = $(PREFIX)/share/applications
LOCALEDIR= $(PREFIX)/share/locale
DFLAGS =
-OFLAGS = -O2
-AOFLAGS = -O3
+#OFLAGS = -O2
+#AOFLAGS = -O3
STROKEFLAGS = -Wall -std=c99 $(DFLAGS)
-CXXFLAGS = -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" `pkg-config gtkmm-3.0 dbus-glib-1 --cflags`
-CFLAGS = -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" `pkg-config gtk+-3.0 --cflags` -DGETTEXT_PACKAGE='"easystroke"'
-LDFLAGS = $(DFLAGS)
+CXXFLAGS += -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" $(shell $(PKG_CONFIG) gtkmm-3.0 dbus-glib-1 --cflags)
+CFLAGS += -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" $(shell $(PKG_CONFIG) gtk+-3.0 --cflags) -DGETTEXT_PACKAGE='"easystroke"'
+#LDFLAGS = $(DFLAGS)
-LIBS = $(DFLAGS) -lboost_serialization -lX11 -lXext -lXi -lXfixes -lXtst `pkg-config gtkmm-3.0 dbus-glib-1 --libs`
+LIBS = $(DFLAGS) -lboost_serialization -lX11 -lXext -lXi -lXfixes -lXtst $(shell $(PKG_CONFIG) gtkmm-3.0 dbus-glib-1 --libs)
BINARY = easystroke
ICON = easystroke.svg
@@ -60,7 +60,7 @@
include $(DEPFILES)
$(BINARY): $(OFILES)
- $(CXX) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
+ $(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
stroke.o: stroke.c
$(CC) $(STROKEFLAGS) $(AOFLAGS) -MT $@ -MMD -MP -MF $*.Po -o $@ -c $<
@@ -119,7 +119,7 @@
help2man -N -n "X11 gesture recognition application" ./$(BINARY) > $@
install: all
- install -Ds $(BINARY) $(DESTDIR)$(BINDIR)/$(BINARY)
+ install -D $(BINARY) $(DESTDIR)$(BINDIR)/$(BINARY)
install -D -m 644 $(ICON) $(DESTDIR)$(ICONDIR)/$(ICON)
install -D -m 644 $(MENU) $(DESTDIR)$(MENUDIR)/$(MENU)
for f in $(MOFILES); do \
|
GitWeb
