Utils use _GNU_SOURCE

[platform/upstream/kbd.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 629f2f7..bfea328 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,11 @@
-AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" -DLOCALEDIR=\"$(localedir)\" \
+AM_CPPFLAGS = \
+       -I$(srcdir)/libkeymap -I$(builddir)/libkeymap \
+       -I$(srcdir)/libkeymap/keymap -I$(builddir)/libkeymap/keymap \
+       -DDATADIR=\"$(datadir)\" -DLOCALEDIR=\"$(localedir)\" \
+       -D_FORTIFY_SOURCE=2 \
        -funit-at-a-time
 
-SUBDIRS = vlock
+SUBDIRS = vlock libkeymap
 
 OLDPROGS = mapscrn loadunimap
 PROGS = \
@@ -27,13 +31,12 @@ dist_bin_SCRIPTS = unicode_start unicode_stop
 bin_PROGRAMS = $(OLDPROGS) $(PROGS)
 
 EXTRA_DIST = \
-       loadkeys.analyze.c loadkeys.analyze.l wctomb.c totextmode.c \
-       README.cad README.init README.openvt \
+       wctomb.c \
+       totextmode.c README.cad README.init README.openvt \
        cad
 
 
 libcommon_a_SOURCES = \
-       findfile.c findfile.h \
        getfd.c getfd.h \
        xmalloc.c xmalloc.h
 
@@ -44,25 +47,11 @@ libfont_a_SOURCES   = \
        loadunimap.c loadunimap.h \
        kdfontop.c kdfontop.h
 
-noinst_LIBRARIES = libcommon.a libfont.a
-
-LDADD = libcommon.a
-
-clrunimap_LDADD       = libcommon.a libfont.a
-getunimap_LDADD       = libcommon.a libfont.a
-loadunimap_LDADD      = libcommon.a libfont.a
-mapscrn_LDADD         = libcommon.a libfont.a
-psfxtable_LDADD       = libcommon.a libfont.a
-setfont_LDADD         = libcommon.a libfont.a
-showconsolefont_LDADD = libcommon.a libfont.a
-
-ALL_S   = modifiers.h nls.h paths.h version.h kbd.h
-KSYMS_S = ksyms.c ksyms.h cp1250.syms.h ethiopic.syms.h koi8.syms.h sami.syms.h thai.syms.h
+ALL_S   = nls.h paths.h version.h kbd.h
 
 chvt_SOURCES            = $(ALL_S) chvt.c
 clrunimap_SOURCES       = $(ALL_S) clrunimap.c
 deallocvt_SOURCES       = $(ALL_S) deallocvt.c
-dumpkeys_SOURCES        = $(ALL_S) dumpkeys.c $(KSYMS_S)
 fgconsole_SOURCES       = $(ALL_S) fgconsole.c
 getkeycodes_SOURCES     = $(ALL_S) getkeycodes.c
 getunimap_SOURCES       = $(ALL_S) getunimap.c
@@ -83,12 +72,14 @@ showconsolefont_SOURCES = $(ALL_S) showconsolefont.c
 showkey_SOURCES         = $(ALL_S) showkey.c
 kbdinfo_SOURCES         = $(ALL_S) kbdinfo.c
 
+dumpkeys_SOURCES        = $(ALL_S) dumpkeys.c
+loadkeys_SOURCES        = $(ALL_S) loadkeys.c
+
 mapscrn_CFLAGS = -DMAIN
 loadunimap_CFLAGS = -DMAIN
 
-AM_LFLAGS = --header-file=$(CURDIR)/loadkeys.analyze.h
-BUILT_SOURCES = loadkeys.c loadkeys.analyze.c loadkeys.h loadkeys.analyze.h
-loadkeys_SOURCES = loadkeys.y loadkeys.analyze.l $(KSYMS_S)
+noinst_LIBRARIES = libcommon.a libfont.a
+LDADD = libcommon.a libfont.a libkeymap/libkeymap.la
 
 install-exec-hook:
        for i in psfaddtable psfgettable psfstriptable; do \