diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-09-26 14:06:19 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-09-26 14:06:19 +0000 |
| commit | 1e3c1fcdaab91d7c428f33ebba72c4eb178348f7 (patch) | |
| tree | 303729560cafc4c4a2aaf67bbd05b7d24d6ea9ba /app/bitmap/Makefile.am | |
| parent | 050a65b29195c30b3a0242f042e5f8a106d08725 (diff) | |
Update to bitmap 1.0.4
Diffstat (limited to 'app/bitmap/Makefile.am')
| -rw-r--r-- | app/bitmap/Makefile.am | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/app/bitmap/Makefile.am b/app/bitmap/Makefile.am index 76f7d8d18..13a392be0 100644 --- a/app/bitmap/Makefile.am +++ b/app/bitmap/Makefile.am @@ -23,7 +23,7 @@ bin_PROGRAMS = bitmap bmtoa atobm # bitmap -bitmap_CFLAGS = $(BITMAP_CFLAGS) +bitmap_CFLAGS = $(CWARNFLAGS) $(BITMAP_CFLAGS) bitmap_LDADD = $(BITMAP_LIBS) -lm bitmap_SOURCES = \ @@ -41,14 +41,14 @@ bitmap_SOURCES = \ # bmtoa -bmtoa_CFLAGS = $(BMTOA_CFLAGS) +bmtoa_CFLAGS = $(CWARNFLAGS) $(BMTOA_CFLAGS) bmtoa_LDADD = $(BMTOA_LIBS) bmtoa_SOURCES = \ bmtoa.c # atobm -atobm_CFLAGS = $(ATOBM_CFLAGS) +atobm_CFLAGS = $(CWARNFLAGS) $(ATOBM_CFLAGS) atobm_LDADD = $(ATOBM_LDADD) atobm_SOURCES = \ atobm.c @@ -59,27 +59,27 @@ appman_PRE = \ bitmap.man -# app default files - # App default files (*.ad) +DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults + appdefaultdir = @appdefaultdir@ -APPDEFAULTFILES = \ - Bitmap-color \ - Bitmap-nocase \ - Bitmap +dist_appdefault_DATA = \ + app-defaults/Bitmap-color \ + app-defaults/Bitmap-nocase \ + app-defaults/Bitmap -SUFFIXES = .ad -.ad: - cp $< $@ +EXTRA_DIST = bitmap.icon ChangeLog autogen.sh +MAINTAINERCLEANFILES=ChangeLog -appdefault_DATA = $(APPDEFAULTFILES) +.PHONY: ChangeLog +ChangeLog: + $(CHANGELOG_CMD) -EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) bitmap.icon -CLEANFILES = $(APPDEFAULTFILES) +dist-hook: ChangeLog # bitmaps @@ -110,7 +110,7 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) \ BUILT_SOURCES = shadows.DONE EXTRA_DIST += $(appman_PRE) -CLEANFILES += $(appman_DATA) $(BUILT_SOURCES) +CLEANFILES = $(appman_DATA) $(BUILT_SOURCES) SED = sed @@ -131,7 +131,7 @@ 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) < $< > $@ |