Takashi Iwai
5ada1b3675
kanjipad-drop-disable-deprecated.patch - Move COPYING to %license OBS-URL: https://build.opensuse.org/package/show/M17N/kanjipad?expand=0&rev=13
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
---
|
|
Makefile | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1,7 +1,7 @@
|
|
OPTIMIZE=-g -Wall
|
|
#OPTIMIZE=-O2
|
|
|
|
-GTKINC=$(shell pkg-config --cflags gtk+-2.0) -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
|
|
+GTKINC=$(shell pkg-config --cflags gtk+-2.0) -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
|
|
GTKLIBS=$(shell pkg-config --libs gtk+-2.0)
|
|
GLIBLIBS=$(shell pkg-config --libs glib-2.0)
|
|
|
|
@@ -26,7 +26,7 @@ PACKAGE = kanjipad
|
|
VERSION = 2.0.0
|
|
|
|
OBJS = kpengine.o scoring.o util.o
|
|
-CFLAGS = $(OPTIMIZE) $(GTKINC) -DFOR_PILOT_COMPAT -DKP_LIBDIR=\"$(LIBDIR)\" -DBINDIR=\"$(BINDIR)\"
|
|
+CFLAGS = $(OPTIMIZE) $(GTKINC) $(shell getconf LFS_CFLAGS) -DFOR_PILOT_COMPAT -DKP_LIBDIR=\"$(LIBDIR)\" -DBINDIR=\"$(BINDIR)\"
|
|
|
|
all: kpengine kanjipad jdata.dat
|
|
|
|
@@ -40,7 +40,7 @@ kpengine: $(OBJS)
|
|
$(CC) -o kpengine $(OBJS) $(GLIBLIBS) $(LDFLAGS)
|
|
|
|
kanjipad: kanjipad.o padarea.o
|
|
- $(CC) -o kanjipad kanjipad.o padarea.o $(GTKLIBS) $(LDFLAGS)
|
|
+ $(CC) -o kanjipad kanjipad.o padarea.o -lm $(GTKLIBS) $(LDFLAGS)
|
|
|
|
jdata.dat: jstroke/strokedata.h conv_jdata.pl
|
|
perl conv_jdata.pl < jstroke/strokedata.h > jdata.dat
|
|
@@ -75,4 +75,4 @@ distcheck: dist
|
|
cd .. && \
|
|
rm -rf $$distdir
|
|
|
|
-.PHONY: dist distcheck
|
|
\ No newline at end of file
|
|
+.PHONY: dist distcheck
|