diff options
author | Matt Fleming <matt.fleming@intel.com> | 2011-12-06 15:45:14 +0000 |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2011-12-16 16:31:19 +0000 |
commit | 8f767b805cb3d63087d9d4f2eeb5eaf90bd71c30 (patch) | |
tree | beaf7a192acd6284976068c724f47c7925f3f758 | |
parent | ca7406a7da2ce19ae314fe925fa9c4870ae11633 (diff) | |
download | syslinux-8f767b805cb3d63087d9d4f2eeb5eaf90bd71c30.tar.gz syslinux-8f767b805cb3d63087d9d4f2eeb5eaf90bd71c30.tar.xz syslinux-8f767b805cb3d63087d9d4f2eeb5eaf90bd71c30.zip |
Move the list of MINLIBOBJS to mk/lib.mk so that we can include it in
efi/Makefile.
-rw-r--r-- | com32/lib/Makefile | 133 | ||||
-rw-r--r-- | mk/lib.mk | 132 |
2 files changed, 132 insertions, 133 deletions
diff --git a/com32/lib/Makefile b/com32/lib/Makefile index 11c7c48c..fbd8395e 100644 --- a/com32/lib/Makefile +++ b/com32/lib/Makefile @@ -16,13 +16,6 @@ LIBPNG_OBJS = \ libpng/pngrio.o libpng/pngwio.o libpng/pngwrite.o \ libpng/pngrtran.o libpng/pngwtran.o libpng/pngmem.o \ libpng/pngerror.o libpng/pngpread.o - -# ZIP library object files -LIBZLIB_OBJS = \ - zlib/adler32.o zlib/compress.o zlib/crc32.o \ - zlib/uncompr.o zlib/deflate.o zlib/trees.o zlib/zutil.o \ - zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/inffast.o \ - sys/zfile.o sys/zfopen.o # JPG library object files LIBJPG_OBJS = \ @@ -53,135 +46,9 @@ LIBSYSLINUX_OBJS = \ syslinux/video/fontquery.o syslinux/video/forcetext.o \ syslinux/video/reportmode.o -LIBLOAD_OBJS = \ - syslinux/addlist.o syslinux/freelist.o syslinux/memmap.o \ - syslinux/movebits.o syslinux/shuffle.o syslinux/shuffle_pm.o \ - syslinux/shuffle_rm.o syslinux/zonelist.o \ - syslinux/dump_mmap.o syslinux/dump_movelist.o \ - \ - syslinux/run_default.o syslinux/run_command.o \ - syslinux/cleanup.o syslinux/localboot.o syslinux/runimage.o \ - \ - syslinux/loadfile.o syslinux/floadfile.o syslinux/zloadfile.o \ - \ - syslinux/load_linux.o syslinux/initramfs.o \ - syslinux/initramfs_file.o syslinux/initramfs_loadfile.o \ - syslinux/initramfs_archive.o - DYNENTRY_OBJS = \ atexit.o onexit.o abort.o -## CORE OBJECTS, INCLUDED IN THE ROOT COM32 MODULE -LIBENTRY_OBJS = \ - sys/intcall.o sys/farcall.o sys/cfarcall.o sys/zeroregs.o \ - sys/argv.o sys/sleep.o \ - sys/fileinfo.o sys/opendev.o sys/read.o sys/write.o sys/ftell.o \ - sys/close.o sys/open.o sys/fileread.o sys/fileclose.o \ - sys/openmem.o \ - sys/isatty.o sys/fstat.o \ - \ - syslinux/idle.o \ - \ - exit.o - -LIBMODULE_OBJS = \ - sys/module/common.o sys/module/elf_module.o \ - sys/module/shallow_module.o sys/module/elfutils.o \ - sys/module/exec.o - -LIBGCC_OBJS = \ - libgcc/__ashldi3.o libgcc/__udivdi3.o \ - libgcc/__negdi2.o libgcc/__ashrdi3.o libgcc/__lshrdi3.o \ - libgcc/__muldi3.o libgcc/__udivmoddi4.o libgcc/__umoddi3.o \ - libgcc/__divdi3.o libgcc/__moddi3.o - -LIBCONSOLE_OBJS = \ - \ - sys/openconsole.o sys/line_input.o \ - sys/colortable.o sys/screensize.o \ - \ - sys/stdcon_read.o sys/stdcon_write.o sys/rawcon_read.o \ - sys/rawcon_write.o sys/err_read.o sys/err_write.o \ - sys/null_read.o sys/null_write.o sys/serial_write.o \ - \ - sys/xserial_write.o \ - \ - sys/ansi.o \ - \ - sys/ansicon_write.o sys/ansiserial_write.o \ - \ - syslinux/serial.o - -LIBOTHER_OBJS = \ - atoi.o atol.o atoll.o calloc.o creat.o \ - ctypes.o errno.o fgetc.o fgets.o fopen.o fprintf.o fputc.o \ - fclose.o putchar.o setjmp.o \ - fputs.o fread2.o fread.o fwrite2.o fwrite.o \ - getopt.o getopt_long.o \ - lrand48.o stack.o memccpy.o memchr.o memcmp.o \ - memcpy.o mempcpy.o memmem.o memmove.o memset.o memswap.o \ - perror.o printf.o puts.o qsort.o seed48.o snprintf.o \ - sprintf.o srand48.o sscanf.o strcasecmp.o strcat.o \ - strchr.o strcmp.o strcpy.o strdup.o strerror.o strlen.o \ - strnlen.o \ - strncat.o strncmp.o strncpy.o strndup.o \ - strncasecmp.o \ - stpcpy.o stpncpy.o \ - strntoimax.o strntoumax.o strrchr.o strsep.o strspn.o strstr.o \ - strtoimax.o strtok.o strtol.o strtoll.o strtoul.o strtoull.o \ - strtoumax.o vfprintf.o vprintf.o vsnprintf.o vsprintf.o \ - asprintf.o vasprintf.o strlcpy.o strlcat.o \ - vsscanf.o \ - skipspace.o \ - chrreplace.o \ - bufprintf.o \ - inet.o \ - \ - lmalloc.o lstrdup.o \ - \ - dprintf.o vdprintf.o \ - \ - suffix_number.o \ - \ - getcwd.o fdopendir.o \ - \ - libgcc/__ashldi3.o libgcc/__udivdi3.o \ - libgcc/__negdi2.o libgcc/__ashrdi3.o libgcc/__lshrdi3.o \ - libgcc/__muldi3.o libgcc/__udivmoddi4.o libgcc/__umoddi3.o \ - libgcc/__divdi3.o libgcc/__moddi3.o \ - \ - sys/openconsole.o sys/line_input.o \ - sys/colortable.o sys/screensize.o \ - \ - sys/stdcon_read.o sys/stdcon_write.o sys/rawcon_read.o \ - sys/rawcon_write.o sys/err_read.o sys/err_write.o \ - sys/null_read.o sys/null_write.o sys/serial_write.o \ - \ - sys/xserial_write.o \ - \ - sys/ansi.o \ - \ - sys/ansicon_write.o sys/ansiserial_write.o \ - \ - pci/cfgtype.o pci/scan.o pci/bios.o \ - pci/readb.o pci/readw.o pci/readl.o \ - pci/writeb.o pci/writew.o pci/writel.o \ - \ - sys/x86_init_fpu.o math/pow.o math/strtod.o \ - \ - syslinux/memscan.o syslinux/firmware.o - -MINLIBOBJS = \ - $(LIBOTHER_OBJS) \ - $(LIBENTRY_OBJS) \ - $(LIBGCC_OBJS) \ - $(LIBCONSOLE_OBJS) \ - $(LIBLOAD_OBJS) \ - $(LIBMODULE_OBJS) \ - $(LIBZLIB_OBJS) -# $(LIBVESA_OBJS) - - DYNLIBOBJS = \ $(LIBZLIB_OBJS) \ $(LIBPNG_OBJS) \ @@ -41,6 +41,138 @@ WARNFLAGS = $(GCCWARN) -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Winl CFLAGS = $(OPTFLAGS) $(REQFLAGS) $(WARNFLAGS) $(LIBFLAGS) LDFLAGS = -m elf_i386 --hash-style=gnu +LIBOTHER_OBJS = \ + atoi.o atol.o atoll.o calloc.o creat.o \ + ctypes.o errno.o fgetc.o fgets.o fopen.o fprintf.o fputc.o \ + fclose.o putchar.o setjmp.o \ + fputs.o fread2.o fread.o fwrite2.o fwrite.o \ + getopt.o getopt_long.o \ + lrand48.o stack.o memccpy.o memchr.o memcmp.o \ + memcpy.o mempcpy.o memmem.o memmove.o memset.o memswap.o \ + perror.o printf.o puts.o qsort.o seed48.o snprintf.o \ + sprintf.o srand48.o sscanf.o strcasecmp.o strcat.o \ + strchr.o strcmp.o strcpy.o strdup.o strerror.o strlen.o \ + strnlen.o \ + strncat.o strncmp.o strncpy.o strndup.o \ + strncasecmp.o \ + stpcpy.o stpncpy.o \ + strntoimax.o strntoumax.o strrchr.o strsep.o strspn.o strstr.o \ + strtoimax.o strtok.o strtol.o strtoll.o strtoul.o strtoull.o \ + strtoumax.o vfprintf.o vprintf.o vsnprintf.o vsprintf.o \ + asprintf.o vasprintf.o strlcpy.o strlcat.o \ + vsscanf.o \ + skipspace.o \ + chrreplace.o \ + bufprintf.o \ + inet.o \ + \ + lmalloc.o lstrdup.o \ + \ + dprintf.o vdprintf.o \ + \ + suffix_number.o \ + \ + getcwd.o fdopendir.o \ + \ + libgcc/__ashldi3.o libgcc/__udivdi3.o \ + libgcc/__negdi2.o libgcc/__ashrdi3.o libgcc/__lshrdi3.o \ + libgcc/__muldi3.o libgcc/__udivmoddi4.o libgcc/__umoddi3.o \ + libgcc/__divdi3.o libgcc/__moddi3.o \ + \ + sys/openconsole.o sys/line_input.o \ + sys/colortable.o sys/screensize.o \ + \ + sys/stdcon_read.o sys/stdcon_write.o sys/rawcon_read.o \ + sys/rawcon_write.o sys/err_read.o sys/err_write.o \ + sys/null_read.o sys/null_write.o sys/serial_write.o \ + \ + sys/xserial_write.o \ + \ + sys/ansi.o \ + \ + sys/ansicon_write.o sys/ansiserial_write.o \ + \ + pci/cfgtype.o pci/scan.o pci/bios.o \ + pci/readb.o pci/readw.o pci/readl.o \ + pci/writeb.o pci/writew.o pci/writel.o \ + \ + sys/x86_init_fpu.o math/pow.o math/strtod.o \ + \ + syslinux/memscan.o syslinux/firmware.o + +## CORE OBJECTS, INCLUDED IN THE ROOT COM32 MODULE +LIBENTRY_OBJS = \ + sys/intcall.o sys/farcall.o sys/cfarcall.o sys/zeroregs.o \ + sys/argv.o sys/sleep.o \ + sys/fileinfo.o sys/opendev.o sys/read.o sys/write.o sys/ftell.o \ + sys/close.o sys/open.o sys/fileread.o sys/fileclose.o \ + sys/openmem.o \ + sys/isatty.o sys/fstat.o \ + \ + syslinux/idle.o \ + \ + exit.o + +LIBGCC_OBJS = \ + libgcc/__ashldi3.o libgcc/__udivdi3.o \ + libgcc/__negdi2.o libgcc/__ashrdi3.o libgcc/__lshrdi3.o \ + libgcc/__muldi3.o libgcc/__udivmoddi4.o libgcc/__umoddi3.o \ + libgcc/__divdi3.o libgcc/__moddi3.o + +LIBCONSOLE_OBJS = \ + \ + sys/openconsole.o sys/line_input.o \ + sys/colortable.o sys/screensize.o \ + \ + sys/stdcon_read.o sys/stdcon_write.o sys/rawcon_read.o \ + sys/rawcon_write.o sys/err_read.o sys/err_write.o \ + sys/null_read.o sys/null_write.o sys/serial_write.o \ + \ + sys/xserial_write.o \ + \ + sys/ansi.o \ + \ + sys/ansicon_write.o sys/ansiserial_write.o \ + \ + syslinux/serial.o + +LIBLOAD_OBJS = \ + syslinux/addlist.o syslinux/freelist.o syslinux/memmap.o \ + syslinux/movebits.o syslinux/shuffle.o syslinux/shuffle_pm.o \ + syslinux/shuffle_rm.o syslinux/zonelist.o \ + syslinux/dump_mmap.o syslinux/dump_movelist.o \ + \ + syslinux/run_default.o syslinux/run_command.o \ + syslinux/cleanup.o syslinux/localboot.o syslinux/runimage.o \ + \ + syslinux/loadfile.o syslinux/floadfile.o syslinux/zloadfile.o \ + \ + syslinux/load_linux.o syslinux/initramfs.o \ + syslinux/initramfs_file.o syslinux/initramfs_loadfile.o \ + syslinux/initramfs_archive.o + +LIBMODULE_OBJS = \ + sys/module/common.o sys/module/elf_module.o \ + sys/module/shallow_module.o sys/module/elfutils.o \ + sys/module/exec.o + +# ZIP library object files +LIBZLIB_OBJS = \ + zlib/adler32.o zlib/compress.o zlib/crc32.o \ + zlib/uncompr.o zlib/deflate.o zlib/trees.o zlib/zutil.o \ + zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/inffast.o \ + sys/zfile.o sys/zfopen.o + +MINLIBOBJS = \ + $(LIBOTHER_OBJS) \ + $(LIBENTRY_OBJS) \ + $(LIBGCC_OBJS) \ + $(LIBCONSOLE_OBJS) \ + $(LIBLOAD_OBJS) \ + $(LIBMODULE_OBJS) \ + $(LIBZLIB_OBJS) +# $(LIBVESA_OBJS) + .SUFFIXES: .c .o .a .so .lo .i .S .s .ls .ss .lss % : %.c # Cancel default rule |