From f513eefab90a20ef93058642e52fdaf872e9ac2b Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 13:45:59 +0200 Subject: [PATCH 1/4] Readd AC_CONFIG_HEADERS(). --- configure.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index d4fa0f7e..172c1ecd 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,8 @@ AC_CONFIG_AUX_DIR(config) PACKAGE=elinks VERSION=0.11.GIT AC_SUBST(PACKAGE) -AC_SUBST(VERSION +AC_SUBST(VERSION) +AC_CONFIG_HEADERS(config.h) AC_PROG_MAKE_SET From 3b6c3cc5b4999337285910801cf111a45a09616d Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 13:48:22 +0200 Subject: [PATCH 2/4] Fix dependencies tracking and default clean rule. --- Makefile.lib | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.lib b/Makefile.lib index ce6f9da5..f1febf50 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -43,7 +43,7 @@ DEP_FILES = $(DEP_FILES_1:%.o=%.P) DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -ifdef $(OBJS) +ifdef OBJS -include $(DEP_FILES) endif @@ -58,7 +58,7 @@ endif %.a: $(call cmd,archive) -ifdef $(OBJS) +ifdef OBJS clean-l: rm -f $(OBJS) *.a endif From 96c100b01420c7977c3f58cd8e3b592479870b07 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 13:54:26 +0200 Subject: [PATCH 3/4] Define PACKAGE and VERSION macros in config.h. --- configure.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.in b/configure.in index 172c1ecd..954fae75 100644 --- a/configure.in +++ b/configure.in @@ -8,6 +8,8 @@ PACKAGE=elinks VERSION=0.11.GIT AC_SUBST(PACKAGE) AC_SUBST(VERSION) +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Package version]) +AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Package version]) AC_CONFIG_HEADERS(config.h) AC_PROG_MAKE_SET From 885bb75c66f29b3782a02cd5e96756d8b9d76e8f Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 13:58:56 +0200 Subject: [PATCH 4/4] Typo fix. --- src/mime/backend/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mime/backend/Makefile b/src/mime/backend/Makefile index 20e246e3..3cd5cde3 100644 --- a/src/mime/backend/Makefile +++ b/src/mime/backend/Makefile @@ -9,7 +9,7 @@ ifeq ($(CONFIG_MIMETYPES),yes) mimetypesobj = mimetypes.o endif -OBJS = common.o default.o $(mailcapobj) $(mimetypeobj) +OBJS = common.o default.o $(mailcapobj) $(mimetypesobj) # Do not forget to also add the .o to ../Makefile. Yes, it sucks. all-l: $(OBJS)