Ignore some generated files

[oweals/busybox.git] / Makefile

diff --git a/Makefile b/Makefile
index 28cd3403a0f8c15bbfa958425d9f2b405d7940c1..5a62cb0efd52f60c9623b595b43a26bdfb903f73 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -212,7 +212,7 @@ endif
 # And option 4:
 -include applet_source_list
 
-OBJECTS   = $(APPLET_SOURCES:.c=.o) busybox.o messages.o usage.o applets.o
+OBJECTS   = $(APPLET_SOURCES:.c=.o) busybox.o usage.o applets.o
 CFLAGS    += $(CROSS_CFLAGS)
 CFLAGS    += -DBB_VER='"$(VERSION)"'
 CFLAGS    += -DBB_BT='"$(BUILDTIME)"'
@@ -248,14 +248,19 @@ process_escape_sequence.c read_package_field.c read_text_file_to_buffer.c \
 recursive_action.c safe_read.c safe_strncpy.c seek_ared_file.c syscalls.c \
 syslog_msg_with_name.c time_string.c trim.c untar.c unzip.c vdprintf.c \
 verror_msg.c vperror_msg.c wfopen.c xfuncs.c xgetcwd.c xregcomp.c interface.c \
-remove_file.c
-
+remove_file.c last_char_is.c
 LIBBB_OBJS=$(patsubst %.c,$(LIBBB)/%.o, $(LIBBB_CSRC))
 LIBBB_CFLAGS = -I$(LIBBB)
 ifneq ($(strip $(BB_SRC_DIR)),)
     LIBBB_CFLAGS += -I$(BB_SRC_DIR)/$(LIBBB)
 endif
 
+LIBBB_MSRC=libbb/messages.c
+LIBBB_MESSAGES= full_version name_too_long omitting_directory not_a_directory \
+memory_exhausted invalid_date invalid_option io_error dash_dash_help \
+write_error too_few_args name_longer_than_foo
+LIBBB_MOBJ=$(patsubst %,$(LIBBB)/%.o, $(LIBBB_MESSAGES))
+
 
 # Put user-supplied flags at the end, where they
 # have a chance of winning.
@@ -266,6 +271,7 @@ CFLAGS += $(CFLAGS_EXTRA)
 all: applet_source_list busybox busybox.links doc
 
 applet_source_list: busybox.sh Config.h
+       if [ ! -L sh.c ] ; then ln -s lash.c sh.c ; fi
        (echo -n "APPLET_SOURCES := "; $(SHELL) $^ $(BB_SRC_DIR)) > $@
 
 doc: olddoc
@@ -299,7 +305,7 @@ docs/busybox.lineo.com/BusyBox.html: docs/busybox.pod
        -@ mkdir -p docs/busybox.lineo.com
        -  pod2html --noindex $< > \
            docs/busybox.lineo.com/BusyBox.html
-       -@ rm -f pod2html*
+       -@ rm -f pod2htm*
 
 
 # New docs based on DOCBOOK SGML
@@ -352,10 +358,14 @@ $(LIBBB_OBJS): %.o: %.c Config.h busybox.h applets.h Makefile libbb/libbb.h
        - mkdir -p $(LIBBB)
        $(CC) $(CFLAGS) $(LIBBB_CFLAGS) -c $< -o $*.o
 
+$(LIBBB_MOBJ): $(LIBBB_MSRC)
+       - mkdir -p $(LIBBB)
+       $(CC) $(CFLAGS) $(LIBBB_CFLAGS) -DL_$(patsubst libbb/%,%,$*) -c $< -o $*.o
+
 libpwd.a: $(PWD_OBJS)
        $(AR) $(ARFLAGS) $@ $^
 
-libbb.a: $(LIBBB_OBJS)
+libbb.a:  $(LIBBB_MOBJ) $(LIBBB_OBJS)
        $(AR) $(ARFLAGS) $@ $^
 
 usage.o: usage.h
@@ -378,7 +388,7 @@ clean:
        - rm -f docs/busybox.txt docs/busybox.dvi docs/busybox.ps \
            docs/busybox.pdf docs/busybox.lineo.com/busybox.html
        - rm -f multibuild.log Config.h.orig
-       - rm -rf docs/busybox _install libpwd.a libbb.a
+       - rm -rf docs/busybox _install libpwd.a libbb.a pod2htm*
        - rm -f busybox.links libbb/loop.h *~ slist.mk core applet_source_list
        - find -name \*.o -exec rm -f {} \;