72561bebe5
- Move to github - Use last upstream commit, which includes fixes not present in release - Properly use grettext and intltool - Install appdata file provided in upstream repository - Fix error in desktop file [1] - Point WWW to github page - Import patch to fix sporadic crash [2] - Sort plist - Take maintainership obtained from:a255b2af29[1],140b9cae66[2]
38 lines
1.5 KiB
Text
38 lines
1.5 KiB
Text
--- Makefile.orig 2016-07-05 18:32:44 UTC
|
|
+++ Makefile
|
|
@@ -12,23 +12,15 @@
|
|
# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
|
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
-DESTDIR =
|
|
-PREFIX = /usr/local
|
|
BINDIR = $(PREFIX)/bin
|
|
ICONDIR = $(PREFIX)/share/icons/hicolor/scalable/apps
|
|
MENUDIR = $(PREFIX)/share/applications
|
|
LOCALEDIR= $(PREFIX)/share/locale
|
|
-DFLAGS =
|
|
-OFLAGS = -O2
|
|
-AOFLAGS = -O3
|
|
-STROKEFLAGS = -Wall -std=c11 $(DFLAGS)
|
|
-CXXSTD = -std=c++11
|
|
INCLUDES = $(shell pkg-config gtkmm-3.0 dbus-glib-1 --cflags)
|
|
-CXXFLAGS = $(CXXSTD) -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" $(INCLUDES)
|
|
-CFLAGS = -std=c11 -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" $(INCLUDES) -DGETTEXT_PACKAGE='"easystroke"'
|
|
-LDFLAGS = $(DFLAGS)
|
|
+CXXFLAGS += -std=c++11 -Wall -DLOCALEDIR=\"$(LOCALEDIR)\" $(INCLUDES)
|
|
+CFLAGS += -std=c11 -Wall -DLOCALEDIR=\"$(LOCALEDIR)\" $(INCLUDES) -DGETTEXT_PACKAGE='"easystroke"'
|
|
|
|
-LIBS = $(DFLAGS) -lboost_serialization -lX11 -lXext -lXi -lXfixes -lXtst `pkg-config gtkmm-3.0 dbus-glib-1 --libs`
|
|
+LIBS = -lboost_serialization -lX11 -lXext -lXi -lXfixes -lXtst $(shell pkg-config gtkmm-3.0 dbus-glib-1 --libs)
|
|
|
|
BINARY = easystroke
|
|
ICON = easystroke.svg
|
|
@@ -65,7 +57,7 @@ stroke.o: stroke.c
|
|
$(CXX) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
|
|
|
|
stroke.o: stroke.c
|
|
- $(CC) $(STROKEFLAGS) $(AOFLAGS) -MT $@ -MMD -MP -MF $*.Po -o $@ -c $<
|
|
+ $(CC) $(CFLAGS) $(AOFLAGS) -MT $@ -MMD -MP -MF $*.Po -o $@ -c $<
|
|
|
|
%.o: %.c
|
|
$(CC) $(CFLAGS) $(OFLAGS) -MT $@ -MMD -MP -MF $*.Po -o $@ -c $<
|