diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-04-23 19:33:00 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-04-23 19:33:00 +0000 |
| commit | 3d360a6a07f1681fb0e7cb399f32b5dbfab3f103 (patch) | |
| tree | 2d7153e484651857c66e63f5ebcc05dcb6ab2585 /app/xmore/Makefile.am | |
| parent | 48eab02141e526efe94358b07c08ebe90a0ed2c2 (diff) | |
Update to -current xmore from X.org git.
This version mainly removes Xprint support.
Diffstat (limited to 'app/xmore/Makefile.am')
| -rw-r--r-- | app/xmore/Makefile.am | 50 |
1 files changed, 20 insertions, 30 deletions
diff --git a/app/xmore/Makefile.am b/app/xmore/Makefile.am index 53c3ca606..0e8653d71 100644 --- a/app/xmore/Makefile.am +++ b/app/xmore/Makefile.am @@ -21,54 +21,33 @@ bin_PROGRAMS = xmore -xmore_CFLAGS = $(XMORE_CFLAGS) -DXMORE +AM_CFLAGS = $(XMORE_CFLAGS) -DXMORE $(CWARNFLAGS) xmore_LDADD = $(XMORE_LIBS) xmore_SOURCES = \ xmore.c \ xmore.h -if XAW_USE_XPRINT -xmore_CFLAGS += -DUSE_XPRINT - -xmore_SOURCES += \ - print.c \ - printdialog.c \ - printdialog.h \ - printdialogprivates.h \ - print.h -endif - appman_PRE = \ xmore.man -# App default files (*.ad) +# App default files +DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults appdefaultdir = @appdefaultdir@ +dist_appdefault_DATA = \ + app-defaults/XMore -APPDEFAULTFILES = \ - XMore - -SUFFIXES = .ad - -.ad: - cp $< $@ - -appdefault_DATA = $(APPDEFAULTFILES) - -EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) - -CLEANFILES = $(APPDEFAULTFILES) - -EXTRA_DIST += xmore.sgml +EXTRA_DIST = xmore.sgml appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST += $(appman_PRE) -CLEANFILES += $(appman_DATA) +MAINTAINERCLEANFILES = ChangeLog INSTALL +CLEANFILES = $(appman_DATA) SED = sed @@ -89,7 +68,18 @@ MAN_SUBSTS = \ -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' -SUFFIXES += .$(APP_MAN_SUFFIX) .man +SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): sed $(MAN_SUBSTS) < $< > $@ + + +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog INSTALL |