From 664e4106c6b9a765a4db7ac30ba9a3cf70aeb6ed Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 6 Oct 2005 16:06:04 +0000 Subject: [PATCH] Added global rules for man pages. --- Make.rules.in | 7 +++++-- loader/Makefile.in | 11 ++++------- server/Makefile.in | 6 ------ tools/winebuild/Makefile.in | 11 +++-------- 4 files changed, 12 insertions(+), 23 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 456180d169c..ddc92744dc9 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -116,7 +116,7 @@ LINTS = $(C_SRCS:.c=.ln) # Implicit rules -.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.o .idl .tlb .h .ok .sfd .ttf +.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.o .idl .tlb .h .ok .sfd .ttf .man.in .man .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< @@ -151,6 +151,9 @@ LINTS = $(C_SRCS:.c=.ln) .sfd.ttf: $(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $@ +.man.in.man: + sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $< >$@ || ($(RM) $@ && false) + # 'all' target first in case the enclosing Makefile didn't define any target all: Makefile @@ -217,7 +220,7 @@ $(EXTRASUBDIRS:%=%/__clean__): dummy testclean:: $(SUBDIRS:%=%/__testclean__) clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__) - $(RM) $(CLEAN_FILES) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res) $(MC_SRCS:.mc=.mc.rc) $(IDL_SRCS:.idl=.h) $(PROGRAMS) $(RC_BINARIES) $(RC_TLB) + $(RM) $(CLEAN_FILES) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res) $(MC_SRCS:.mc=.mc.rc) $(IDL_SRCS:.idl=.h) $(PROGRAMS) $(RC_BINARIES) $(RC_TLB) $(MANPAGES) .PHONY: clean testclean $(SUBDIRS:%=%/__clean__) $(SUBDIRS:%=%/__testclean__) $(EXTRASUBDIRS:%=%/__clean__) diff --git a/loader/Makefile.in b/loader/Makefile.in index be99dbff689..60a7e0ebd44 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -17,9 +17,9 @@ PTHREAD_OBJS = pthread.o main.o WINE_BINARIES = @WINE_BINARIES@ MAIN_BINARY = @MAIN_BINARY@ -MAN_TARGETS = wine.man +MANPAGES = wine.man -all: $(WINE_BINARIES) $(MODULE) $(MAN_TARGETS) +all: $(WINE_BINARIES) $(MODULE) $(MANPAGES) @MAKE_RULES@ @@ -41,10 +41,7 @@ wine-pthread: $(PTHREAD_OBJS) Makefile.in $(MODULE): $(MAIN_BINARY) $(RM) $(MODULE) && $(LN_S) $(MAIN_BINARY) $(MODULE) -wine.man: wine.man.in - sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $(SRCDIR)/wine.man.in >$@ || ($(RM) $@ && false) - -install:: $(WINE_BINARIES) $(MAN_TARGETS) +install:: $(WINE_BINARIES) $(MANPAGES) $(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext) for f in $(WINE_BINARIES); do \ if [ "$(MAIN_BINARY)" = "$$f" ]; \ @@ -59,6 +56,6 @@ uninstall:: $(RM) $(mandir)/man$(prog_manext)/wine.$(prog_manext) clean:: - $(RM) $(WINE_BINARIES) $(MODULE) $(MAN_TARGETS) + $(RM) $(WINE_BINARIES) $(MODULE) ### Dependencies: diff --git a/server/Makefile.in b/server/Makefile.in index 69650707a11..47687c035f6 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -58,9 +58,6 @@ all: $(PROGRAMS) $(MANPAGES) wineserver: $(OBJS) $(CC) -o $(PROGRAMS) $(OBJS) $(LIBWINE) $(LIBUNICODE) $(LIBPORT) $(LDFLAGS) $(LIBS) -wineserver.man: wineserver.man.in - sed -e 's,@bindir\@,$(bindir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $(SRCDIR)/wineserver.man.in >$@ || ($(RM) $@ && false) - install:: $(PROGRAMS) $(MANPAGES) $(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext) $(INSTALL_PROGRAM) wineserver $(bindir)/wineserver @@ -69,7 +66,4 @@ install:: $(PROGRAMS) $(MANPAGES) uninstall:: $(RM) $(bindir)/wineserver $(mandir)/man$(prog_manext)/wineserver.$(prog_manext) -clean:: - $(RM) $(MANPAGES) - ### Dependencies: diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in index 39dd8c840a0..62d7f6bd794 100644 --- a/tools/winebuild/Makefile.in +++ b/tools/winebuild/Makefile.in @@ -5,6 +5,7 @@ VPATH = @srcdir@ EXEEXT = @EXEEXT@ PROGRAMS = winebuild$(EXEEXT) +MANPAGES = winebuild.man MODULE = none C_SRCS = \ @@ -18,17 +19,14 @@ C_SRCS = \ spec32.c \ utils.c -all: $(PROGRAMS) winebuild.man +all: $(PROGRAMS) $(MANPAGES) @MAKE_RULES@ winebuild$(EXEEXT): $(OBJS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPORT) $(LDFLAGS) -winebuild.man: winebuild.man.in - sed -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $(SRCDIR)/winebuild.man.in >$@ || ($(RM) $@ && false) - -install:: $(PROGRAMS) winebuild.man +install:: $(PROGRAMS) $(MANPAGES) $(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext) $(INSTALL_PROGRAM) winebuild$(EXEEXT) $(bindir)/winebuild$(EXEEXT) $(INSTALL_DATA) winebuild.man $(mandir)/man$(prog_manext)/winebuild.$(prog_manext) @@ -36,7 +34,4 @@ install:: $(PROGRAMS) winebuild.man uninstall:: $(RM) $(bindir)/winebuild$(EXEEXT) $(mandir)/man$(prog_manext)/winebuild.$(prog_manext) -clean:: - $(RM) winebuild.man - ### Dependencies: