From 7410954066d68ac2ad6aea638801714447321fec Mon Sep 17 00:00:00 2001 From: Tatsuya Kinoshita Date: Sun, 19 Jun 2011 20:46:20 +0900 Subject: Explicitly link w3mimgdisplay with -lX11 to build with gcc 4.5 Patch from 0.5.2-10ubuntu1 to explicitly link w3mimgdisplay with -lX11 to build with gcc 4.5, provided by Martin Pitt. --- Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 0137211..2bd8038 100644 --- a/Makefile.in +++ b/Makefile.in @@ -199,7 +199,7 @@ dummy.o: entity.c $(CC) $(CFLAGS) -DDUMMY -c -o $@ $? $(IMGDISPLAY): w3mimgdisplay.o $(ALIB) w3mimg/w3mimg.a - $(IMGLINK) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) $(IMGLDFLAGS) + $(IMGLINK) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) -lX11 $(IMGLDFLAGS) w3mimgdisplay.o: w3mimgdisplay.c w3mimg/w3mimg.h $(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c $(srcdir)/w3mimgdisplay.c -- cgit v1.2.3 From c201b9a6524fd6b07a0979153d5a46ff05aa9860 Mon Sep 17 00:00:00 2001 From: Tatsuya Kinoshita Date: Sun, 19 Jun 2011 20:48:14 +0900 Subject: Remove entity.h when `make clean' The file entity.h is regenerated at build time, so it should be removed when `make clean'. --- Makefile.in | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 0137211..8a04e89 100644 --- a/Makefile.in +++ b/Makefile.in @@ -288,6 +288,7 @@ uninstall: clean: sweep -$(RM) -f *.o *.a $(TARGETS) mktable$(EXT) -$(RM) -f funcname.tab + -$(RM) -f entity.h -$(RM) -f funcname.c funcname1.h funcname2.h tagtable.c functable.c -for dir in w3mimg libwc; \ do \ -- cgit v1.2.3 From af9d18fbbc4b7fb1aa6f13df69667ad6a0dc18b9 Mon Sep 17 00:00:00 2001 From: Tatsuya Kinoshita Date: Sat, 19 May 2012 19:15:45 +0900 Subject: Use $(CPPFLAGS) with $(CPP) Patch from provided by Simon Ruderich. --- Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 52a0aae..4a6f334 100644 --- a/Makefile.in +++ b/Makefile.in @@ -150,7 +150,7 @@ parsetagx.o: html.c funcname.tab: $(DEFUNS) (echo '#define DEFUN(x,y,z) x y';\ - sed -ne '/^DEFUN/{p;n;/^[ ]/p;}' $(DEFUNS)) | $(CPP) - | \ + sed -ne '/^DEFUN/{p;n;/^[ ]/p;}' $(DEFUNS)) | $(CPP) $(CPPFLAGS) - | \ awk '$$1 ~ /^[_A-Za-z]/ { \ for (i=2;i<=NF;i++) { print $$i, $$1} \ }' > $@.tmp -- cgit v1.2.3 From 0b18a8df294692c754ae4c6b29966ef72dd266b5 Mon Sep 17 00:00:00 2001 From: Tatsuya Kinoshita Date: Tue, 22 May 2012 23:09:07 +0900 Subject: Merge from upstream on 2012-05-22 --- Makefile.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 4a6f334..339c95e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -288,8 +288,7 @@ uninstall: clean: sweep -$(RM) -f *.o *.a $(TARGETS) mktable$(EXT) -$(RM) -f funcname.tab - -$(RM) -f entity.h - -$(RM) -f funcname.c funcname1.h funcname2.h tagtable.c functable.c + -$(RM) -f entity.h funcname.c funcname1.h funcname2.h tagtable.c functable.c -for dir in w3mimg libwc; \ do \ (cd $$dir && $(MAKE) clean RM="$(RM)"); \ -- cgit v1.2.3