libbb.h now includes ../busybox.h. This way, files in libbb that have

[oweals/busybox.git] / Makefile

diff --git a/Makefile b/Makefile
index 3b6b910eda551f5b87f0fdc843ccb031bfa403b0..d6a1cd90c3501ec5212ff98d96c6e685ebcca924 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@
 
 PROG      := busybox
 VERSION   := 0.51
-BUILDTIME := $(shell TZ=UTC date --utc "+%Y.%m.%d-%H:%M%z")
+BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z")
 export VERSION
 
 # With a modern GNU make(1) (highly recommended, that's what all the
@@ -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)"'
@@ -236,24 +236,31 @@ endif
 LIBBB    = libbb
 LIBBB_LIB = libbb.a
 LIBBB_CSRC= ask_confirmation.c check_wildcard_match.c chomp.c \
-concat_path_file.c copy_file.c copy_file_chunk.c create_path.c daemon.c \
-device_open.c error_msg.c error_msg_and_die.c find_mount_point.c \
-find_pid_by_name.c find_root_device.c full_read.c full_write.c \
-get_ar_headers.c get_console.c get_last_path_component.c get_line_from_file.c \
-human_readable.c inode_hash.c isdirectory.c kernel_version.c loop.c \
-mode_string.c  module_syscalls.c mtab.c mtab_file.c my_getgrnam.c \
-my_getgrgid.c my_getpwnam.c my_getpwnamegid.c my_getpwuid.c parse_mode.c \
-parse_number.c perror_msg.c perror_msg_and_die.c print_file.c \
-process_escape_sequence.c recursive_action.c safe_read.c safe_strncpy.c \
-syscalls.c syslog_msg_with_name.c time_string.c trim.c vdprintf.c verror_msg.c \
-vperror_msg.c wfopen.c xfuncs.c xgetcwd.c xregcomp.c
-
+concat_path_file.c copy_file.c copy_file_chunk.c create_path.c \
+daemon.c deb_extract.c device_open.c error_msg.c error_msg_and_die.c \
+find_mount_point.c find_pid_by_name.c find_root_device.c full_read.c \
+full_write.c get_ar_headers.c get_console.c get_last_path_component.c \
+get_line_from_file.c gz_open.c human_readable.c inode_hash.c isdirectory.c \
+kernel_version.c loop.c mode_string.c module_syscalls.c mtab.c mtab_file.c \
+my_getgrnam.c my_getgrgid.c my_getpwnam.c my_getpwnamegid.c my_getpwuid.c \
+parse_mode.c parse_number.c perror_msg.c perror_msg_and_die.c print_file.c \
+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
 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.
@@ -297,7 +304,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
@@ -328,7 +335,7 @@ docs/busybox/busyboxdocumentation.html: docs/busybox.sgml
 
 
 busybox: $(PWD_LIB) $(LIBBB_LIB) $(OBJECTS) 
-       $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(PWD_LIB) $(LIBBB_LIB) $(LIBRARIES)
+       $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBBB_LIB) $(PWD_LIB) $(LIBRARIES)
        $(STRIP)
 
 # Without VPATH, rule expands to "/bin/sh busybox.mkll Config.h applets.h"
@@ -350,10 +357,13 @@ $(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)
+       $(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
@@ -376,7 +386,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 {} \;