summaryrefslogtreecommitdiff
path: root/sample
Commit message (Collapse)AuthorAgeFilesLines
* Add per-firmware object directory supportMatt Fleming2012-10-161-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we have multiple firmware backends it no longer makes sense to write object files to the same directory as their source. A better solution is to write the object files to a per-firmware directory under a top-level object directory. The top-level object directory can be specified on the command-line with the O= variable, e.g. make O=/tmp/obj. If no top-level object directory is specified an 'obj' directory is created in the top-level of the Syslinux source repository. All the existing make targets continue to work as before, however now they apply to all firmware backends, e.g. 'make installer' will build the BIOS, 32-bit EFI and 64-bit EFI installers and place them under $(OBJ)/bios, $(OBJ)/efi32 and $(OBJ)/efi64 respectively. Note unlike every other bit of Syslinux, the gpxe objects are still kept in the src directory, e.g. gpxe/src, since gpxe is only required by the BIOS backend. It is possible to specify a make target for a specific firmware or list of firmware with the following syntax, make [firmware[,firmware]] [target[,target]] To clean the object directory for just the BIOS firmware type, 'make bios clean' To build both the 32-bit and 64-bit EFI installers type, 'make efi32 efi64 installer' Since the Syslinux make infrastructure is now more complex a new file doc/building.txt has been created to explain how to build Syslinux. The top-level Makefile now exports some make variables for use in module Makefiles, - topdir - the top-level source directory of the Syslinux repository, e.g. /usr/src/syslinux - objdir - the top-level object directory for the firmware backend currently being built, e.g. /obj/syslinux/bios - SRC - the source directory in the Syslinux repository for the module currently being built, e.g. /usr/src/syslinux/com32/libupload - OBJ - the object directory for the module currently being built, e.g. /obj/syslinux/bios/com32/libupload Since we're rewriting the Makefile infrastructure anyway it seemed like a good idea to add parallel support. By writing subdirectories as prequisites for make targets the objects in those subdirectories can be built in parallel. Signed-off-by: Matt Fleming <matt.fleming@intel.com>
* Makefile: Move Makefile fragments into mk/Matt Fleming2011-04-071-1/+2
| | | | | | | | | | | | | | | | | | Move the MCONFIG files into a mk/ directory and give them more descriptive names. This is purely a cosmetic change to make the 'include' directives a bit more coherent by making it obvious exactly which MCONFIG file we're including. For example, in com32/lua/src/Makefile we exchange the line, include ../../MCONFIG for the much more comprehensible, include $(MAKEDIR)/com32.mk Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
* sample/Makefile: re-add the includeGene Cumm2010-10-251-0/+1
| | | | | Without the include, .ppm.gz to .lss messes up as $(GZIPPROG) is not expanded properly
* sample: remove obsolete "raw" comboot/com32 samplesH. Peter Anvin2010-07-2614-851/+2
| | | | | | | We really don't want people to write code without using the library, so just remove these obsolete and no longer functional samples. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
* Create a dosutil subdirectory and move mdiskchk thereH. Peter Anvin2009-06-262-146/+0
| | | | | | | DOS utilities aren't really "samples". Create a dedicated "dosutil" directory, and move mdiskchk there for now. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Run Nindent on sample/skipatou.cH. Peter Anvin2009-05-291-7/+6
| | | | | | | | | Automatically reformat sample/skipatou.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Run Nindent on sample/printf.cH. Peter Anvin2009-05-291-238/+248
| | | | | | | | | Automatically reformat sample/printf.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Run Nindent on sample/mdiskchk.cH. Peter Anvin2009-05-291-102/+100
| | | | | | | | | Automatically reformat sample/mdiskchk.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Run Nindent on sample/hello2.cH. Peter Anvin2009-05-291-17/+15
| | | | | | | | | Automatically reformat sample/hello2.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Run Nindent on sample/hello.cH. Peter Anvin2009-05-291-12/+11
| | | | | | | | | Automatically reformat sample/hello.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Run Nindent on sample/filetest.cH. Peter Anvin2009-05-291-65/+64
| | | | | | | | | Automatically reformat sample/filetest.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Run Nindent on sample/fd.cH. Peter Anvin2009-05-291-32/+32
| | | | | | | | | Automatically reformat sample/fd.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Run Nindent on sample/conio.cH. Peter Anvin2009-05-291-19/+18
| | | | | | | | | Automatically reformat sample/conio.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Run Nindent on sample/c32echo.cH. Peter Anvin2009-05-291-15/+14
| | | | | | | | | Automatically reformat sample/c32echo.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Run Nindent on sample/atou.cH. Peter Anvin2009-05-291-7/+6
| | | | | | | | | Automatically reformat sample/atou.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Fix NASM dependency generationH. Peter Anvin2009-04-271-1/+1
| | | | | | | | | Fix missing -M from NASM dependency generation calls; adopt the uniform stanza "-M -DDEPEND" even for sites that were already correct. Also, use ">" not ">>" for obvious reasons... Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Unify dependency generation: MCONFIG.embeddedH. Peter Anvin2009-04-271-7/+4
| | | | | | | Unify dependency generation and move common rules into MCONFIG.embedded. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Merge branch 'hdt'H. Peter Anvin2009-03-121-0/+5
|\
| * hdt: Moving hdt from sample to its own directoryErwan Velu2009-02-252-1342/+1
| |
| * hdt: Bump versionErwan Velu2009-02-251-1/+1
| |
| * hdt: Fixing error messageErwan Velu2009-02-251-4/+8
| |
| * hdt: Fixing typoErwan Velu2009-02-251-1/+1
| |
| * hdt: Removing static dmitable, it have to be in the s_dmi structure Making ↵Erwan Velu2009-02-251-27/+41
| | | | | | | | dmi_iterate quieter Relocating hdt' submenus
| * hdt: Adding Syslinux & About menuErwan Velu2009-02-251-5/+85
| |
| * hdt: Adding more defined values for pci components Enabling mulitple kernel ↵Erwan Velu2009-02-251-5/+37
| | | | | | | | modules per pci device Updating pcitest
| * hdt: Returning ENOPCIIDS and ENOMODULESPCIMAP when pci.ids and ↵Erwan Velu2009-02-251-7/+21
| | | | | | | | modules.pcidmap files are missing
| * hdt: More snprintf Use statusbar to display contentErwan Velu2009-02-251-127/+289
| |
| * hdt: Fix typoErwan Velu2009-02-251-4/+5
| |
| * hdt: First code review by Sebastien GonzalveErwan Velu2009-02-251-91/+90
| |
| * hdt: More comments using #ifdef ATA for useless code until I found how to ↵Erwan Velu2009-02-251-88/+142
| | | | | | | | manage ata
| * hdt: Using SUBMENULEN for realocated menusErwan Velu2009-02-251-31/+31
| |
| * hdt: Bump version 0.1.3 Improving menu's content (thx to antoine ginies) ↵Erwan Velu2009-02-251-37/+77
| | | | | | | | Cleaning useless variables Adding more info during hdt startup We now count the number of menu & the number of pci devices Improving display by moving submenu
| * hdt: Improving PCI menu displayErwan Velu2009-02-251-14/+43
| |
| * hdt: Adding kernel menu Removing beep on timeout Adjusting infobar to ↵Erwan Velu2009-02-251-6/+29
| | | | | | | | STATLEN Adding version display PCI scanning must be in the WITH_PCI ifdef
| * hdt: Removing useless stuff Adding bench on memoryErwan Velu2009-02-251-3/+17
| |
| * hdt: Improving disk detectionErwan Velu2009-02-251-27/+78
| |
| * hdt: Preliminary support for disksErwan Velu2009-02-251-79/+216
| |
| * hdt: Fixing device parameter structureErwan Velu2009-02-251-6/+12
| |
| * hdt: Initial harddrive detectionErwan Velu2009-02-251-3/+205
| |
| * hdt: Improving memory detection Adding battery detectionErwan Velu2009-02-251-13/+135
| |
| * hdt: Adding class nameErwan Velu2009-02-251-4/+8
| |
| * hdt: Adding PCI & DMI detection Main function must remain simpleErwan Velu2009-02-252-56/+212
| |
| * hdt: First releaseErwan Velu2009-02-252-1/+203
| |
* | mdiskchk: fix and update the boot loader name tableH. Peter Anvin2009-03-101-2/+4
|/ | | | Fix and update the list of boot loaders in mdiskchk.
* Clean up embedded Makefile targets; fix build failureH. Peter Anvin2008-08-221-7/+3
| | | | | | Unify common pieces to "embedded" targets (those that produce code that runs neither in the host nor in a com32 environment); this fixes the broken sample/ directory Makefile.
* Major Makefile cleanups; gcc 4.3.0 compatiblityH. Peter Anvin2008-08-201-19/+6
| | | | | Cleanup and centralize the Makefile system even more. Fix a gcc 4.3 incompatibility in memdisk (definition of strlen).
* Move files out of root into core, dos, and utilsH. Peter Anvin2008-05-291-2/+2
| | | | | | | | Move source files out of the root directory; the root is a mess and has become virtually unmaintainable. The Syslinux core now lives in core/; the Linux and generic utilities has moved into utils/, and copybs.com has moved into dos/; it had to go somewhere, and it seemed as good a place as any.
* Fixed the various Makefiles so that SYSLINUX compiles on platforms with GCC ↵Stefan Bucur2008-05-121-1/+2
| | | | -fstack-protector flag enabled by default.
* syslinux 3.63: Rename $GZIP to $GZIPPROGMaciej W. Rozycki2008-04-171-2/+2
| | | | | | | | | | | | | If the variable GZIP exists in the environment, overriding it in the Makefile exports it into the environment, causing failures: gzip -cd syslogo.ppm.gz | \ ../ppmtolss16 \#000000=0 \#d0d0d0=7 \#f6f6f6=15 \ > syslogo.lss gzip.gz: No such file or directory 204480 pixels, 25715 bytes, (74.85% compression) Use $GZIPPROG instead.
* Use $(CC) in gcc_ok macro, not plain gccH. Peter Anvin2008-03-051-1/+1
| | | | | Use $(CC) in gcc_ok macro, not plain gcc. This seems to work, iff the gcc_ok macro is declared with =, not :=