1
0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00

Merge with git+ssh://pasky.or.cz/srv/git/elinks.git

This commit is contained in:
Laurent MONIN 2005-09-16 14:05:38 +02:00 committed by Laurent MONIN
commit 67030f0340
3 changed files with 7 additions and 4 deletions

View File

@ -43,7 +43,7 @@ DEP_FILES = $(DEP_FILES_1:%.o=%.P)
DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
ifdef $(OBJS) ifdef OBJS
-include $(DEP_FILES) -include $(DEP_FILES)
endif endif
@ -58,7 +58,7 @@ endif
%.a: %.a:
$(call cmd,archive) $(call cmd,archive)
ifdef $(OBJS) ifdef OBJS
clean-l: clean-l:
rm -f $(OBJS) *.a rm -f $(OBJS) *.a
endif endif

View File

@ -7,7 +7,10 @@ AC_CONFIG_AUX_DIR(config)
PACKAGE=elinks PACKAGE=elinks
VERSION=0.11.GIT VERSION=0.11.GIT
AC_SUBST(PACKAGE) AC_SUBST(PACKAGE)
AC_SUBST(VERSION 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 AC_PROG_MAKE_SET

View File

@ -9,7 +9,7 @@ ifeq ($(CONFIG_MIMETYPES),yes)
mimetypesobj = mimetypes.o mimetypesobj = mimetypes.o
endif 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. # Do not forget to also add the .o to ../Makefile. Yes, it sucks.
all-l: $(OBJS) all-l: $(OBJS)