diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-10-10 09:47:11 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-10-10 09:47:11 +0000 |
| commit | ffd564eb05c09caff0dba3c4eb783739645a440e (patch) | |
| tree | 58f906de13bbe68b47a132c5cb67894539fa84bf /app/xmodmap/Makefile.am | |
| parent | 44ea122b30756c020badba8c13f47bd66f12a133 (diff) | |
update to xmodmap 1.0.4
Diffstat (limited to 'app/xmodmap/Makefile.am')
| -rw-r--r-- | app/xmodmap/Makefile.am | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/app/xmodmap/Makefile.am b/app/xmodmap/Makefile.am index 4c2a2b2c0..fd2a103f3 100644 --- a/app/xmodmap/Makefile.am +++ b/app/xmodmap/Makefile.am @@ -21,8 +21,8 @@ bin_PROGRAMS = xmodmap -xmodmap_CFLAGS = $(DEP_CFLAGS) -xmodmap_LDADD = $(DEP_LIBS) +AM_CFLAGS = $(CWARNFLAGS) $(XMODMAP_CFLAGS) +xmodmap_LDADD = $(XMODMAP_LIBS) xmodmap_SOURCES = \ exec.c \ @@ -36,6 +36,8 @@ appman_PRE = \ xmodmap.man EXTRA_DIST = \ + ChangeLog \ + autogen.sh \ swap.km appmandir = $(APP_MAN_DIR) @@ -51,6 +53,8 @@ SED = sed XORGRELSTRING = @PACKAGE_STRING@ XORGMANNAME = X Version 11 +X11_DATADIR=$(datadir)/X11 # Where libX11 installs XKeysymDB + MAN_SUBSTS = \ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ @@ -58,6 +62,7 @@ MAN_SUBSTS = \ -e 's|__xconfigfile__|xorg.conf|g' \ -e 's|__projectroot__|$(prefix)|g' \ -e 's|__apploaddir__|$(appdefaultdir)|' \ + -e 's|__X11datadir__|$(X11_DATADIR)|' \ -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ @@ -67,4 +72,21 @@ MAN_SUBSTS = \ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ + +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog + +if LINT +ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) + +lint: + $(LINT) $(ALL_LINT_FLAGS) $(AM_CFLAGS) $(xmodmap_SOURCES) +endif LINT |