i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Makefile Engine template: Whitespace cleanup and synchronization.

Browse Source 
Also update comment as FULL is O3 not O2, fixing #14396.
This commit is contained in:
Augustin Cavalier
2018-08-25 21:28:29 -04:00
parent 99158ccedd
commit 427edfcf0d
2 changed files with 56 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/develop/Makefile
+27 -26
View File
@@ -1,47 +1,48 @@
## Haiku Generic Makefile v2.6 ## ## Haiku Generic Makefile v2.6 ##
## Fill in this file to specify the project being created, and the referenced ## Fill in this file to specify the project being created, and the referenced
## Makefile-Engine will do all of the hard work for you. This handles any ## Makefile-Engine will do all of the hard work for you. This handles any
## architecture of Haiku. ## architecture of Haiku.
##
## For more information, see: ## For more information, see:
## file:///system/develop/documentation/makefile-engine.html ## file:///system/develop/documentation/makefile-engine.html
# The name of the binary. # The name of the binary.
NAME = NAME =
# The type of binary, must be one of: # The type of binary, must be one of:
# APP: Application # APP: Application
# SHARED: Shared library or add-on # SHARED: Shared library or add-on
# STATIC: Static library archive # STATIC: Static library archive
# DRIVER: Kernel driver # DRIVER: Kernel driver
TYPE = TYPE =
# If you plan to use localization, specify the application's MIME signature. # If you plan to use localization, specify the application's MIME signature.
APP_MIME_SIG = APP_MIME_SIG =
# The following lines tell Pe and Eddie where the SRCS, RDEFS, and RSRCS are # The following lines tell Pe and Eddie where the SRCS, RDEFS, and RSRCS are
# so that Pe and Eddie can fill them in for you. # so that Pe and Eddie can fill them in for you.
#%{ #%{
# @src->@ # @src->@
# Specify the source files to use. Full paths or paths relative to the # Specify the source files to use. Full paths or paths relative to the
# Makefile can be included. All files, regardless of directory, will have # Makefile can be included. All files, regardless of directory, will have
# their object files created in the common object directory. Note that this # their object files created in the common object directory. Note that this
# means this Makefile will not work correctly if two source files with the # means this Makefile will not work correctly if two source files with the
# same name (source.c or source.cpp) are included from different directories. # same name (source.c or source.cpp) are included from different directories.
# Also note that spaces in folder names do not work well with this Makefile. # Also note that spaces in folder names do not work well with this Makefile.
SRCS = SRCS =
# Specify the resource definition files to use. Full or relative paths can be # Specify the resource definition files to use. Full or relative paths can be
# used. # used.
RDEFS = RDEFS =
# Specify the resource files to use. Full or relative paths can be used. # Specify the resource files to use. Full or relative paths can be used.
# Both RDEFS and RSRCS can be utilized in the same Makefile. # Both RDEFS and RSRCS can be utilized in the same Makefile.
RSRCS = RSRCS =
# End Pe/Eddie support. # End Pe/Eddie support.
# @<-src@ # @<-src@
#%} #%}
# Specify libraries to link against. # Specify libraries to link against.
@@ -56,65 +57,65 @@ RSRCS =
# - if your library does not follow the standard library naming scheme, # - if your library does not follow the standard library naming scheme,
# you need to specify the path to the library and it's name. # you need to specify the path to the library and it's name.
# (e.g. for mylib.a, specify "mylib.a" or "path/mylib.a") # (e.g. for mylib.a, specify "mylib.a" or "path/mylib.a")
LIBS = LIBS =
# Specify additional paths to directories following the standard libXXX.so # Specify additional paths to directories following the standard libXXX.so
# or libXXX.a naming scheme. You can specify full paths or paths relative # or libXXX.a naming scheme. You can specify full paths or paths relative
# to the Makefile. The paths included are not parsed recursively, so # to the Makefile. The paths included are not parsed recursively, so
# include all of the paths where libraries must be found. Directories where # include all of the paths where libraries must be found. Directories where
# source files were specified are automatically included. # source files were specified are automatically included.
LIBPATHS = LIBPATHS =
# Additional paths to look for system headers. These use the form # Additional paths to look for system headers. These use the form
# "#include <header>". Directories that contain the files in SRCS are # "#include <header>". Directories that contain the files in SRCS are
# NOT auto-included here. # NOT auto-included here.
SYSTEM_INCLUDE_PATHS = SYSTEM_INCLUDE_PATHS =
# Additional paths paths to look for local headers. These use the form # Additional paths paths to look for local headers. These use the form
# #include "header". Directories that contain the files in SRCS are # #include "header". Directories that contain the files in SRCS are
# automatically included. # automatically included.
LOCAL_INCLUDE_PATHS = LOCAL_INCLUDE_PATHS =
# Specify the level of optimization that you want. Specify either NONE (O0), # Specify the level of optimization that you want. Specify either NONE (O0),
# SOME (O1), FULL (O2), or leave blank (for the default optimization level). # SOME (O1), FULL (O3), or leave blank (for the default optimization level).
OPTIMIZE := OPTIMIZE :=
# Specify the codes for languages you are going to support in this # Specify the codes for languages you are going to support in this
# application. The default "en" one must be provided too. "make catkeys" # application. The default "en" one must be provided too. "make catkeys"
# will recreate only the "locales/en.catkeys" file. Use it as a template # will recreate only the "locales/en.catkeys" file. Use it as a template
# for creating catkeys for other languages. All localization files must be # for creating catkeys for other languages. All localization files must be
# placed in the "locales" subdirectory. # placed in the "locales" subdirectory.
LOCALES = LOCALES =
# Specify all the preprocessor symbols to be defined. The symbols will not # Specify all the preprocessor symbols to be defined. The symbols will not
# have their values set automatically; you must supply the value (if any) to # have their values set automatically; you must supply the value (if any) to
# use. For example, setting DEFINES to "DEBUG=1" will cause the compiler # use. For example, setting DEFINES to "DEBUG=1" will cause the compiler
# option "-DDEBUG=1" to be used. Setting DEFINES to "DEBUG" would pass # option "-DDEBUG=1" to be used. Setting DEFINES to "DEBUG" would pass
# "-DDEBUG" on the compiler's command line. # "-DDEBUG" on the compiler's command line.
DEFINES = DEFINES =
# Specify the warning level. Either NONE (suppress all warnings), # Specify the warning level. Either NONE (suppress all warnings),
# ALL (enable all warnings), or leave blank (enable default warnings). # ALL (enable all warnings), or leave blank (enable default warnings).
WARNINGS = WARNINGS =
# With image symbols, stack crawls in the debugger are meaningful. # With image symbols, stack crawls in the debugger are meaningful.
# If set to "TRUE", symbols will be created. # If set to "TRUE", symbols will be created.
SYMBOLS := SYMBOLS :=
# Includes debug information, which allows the binary to be debugged easily. # Includes debug information, which allows the binary to be debugged easily.
# If set to "TRUE", debug info will be created. # If set to "TRUE", debug info will be created.
DEBUGGER := DEBUGGER :=
# Specify any additional compiler flags to be used. # Specify any additional compiler flags to be used.
COMPILER_FLAGS = COMPILER_FLAGS =
# Specify any additional linker flags to be used. # Specify any additional linker flags to be used.
LINKER_FLAGS = LINKER_FLAGS =
# Specify the version of this binary. Example: # Specify the version of this binary. Example:
# -app 3 4 0 d 0 -short 340 -long "340 "`echo -n -e '\302\251'`"1999 GNU GPL" # -app 3 4 0 d 0 -short 340 -long "340 "`echo -n -e '\302\251'`"1999 GNU GPL"
# This may also be specified in a resource. # This may also be specified in a resource.
APP_VERSION := APP_VERSION :=
# (Only used when "TYPE" is "DRIVER"). Specify the desired driver install # (Only used when "TYPE" is "DRIVER"). Specify the desired driver install
# location in the /dev hierarchy. Example: # location in the /dev hierarchy. Example:
@@ -122,7 +123,7 @@ APP_VERSION :=
# will instruct the "driverinstall" rule to place a symlink to your driver's # will instruct the "driverinstall" rule to place a symlink to your driver's
# binary in ~/add-ons/kernel/drivers/dev/video/usb, so that your driver will # binary in ~/add-ons/kernel/drivers/dev/video/usb, so that your driver will
# appear at /dev/video/usb when loaded. The default is "misc". # appear at /dev/video/usb when loaded. The default is "misc".
DRIVER_PATH = DRIVER_PATH =
## Include the Makefile-Engine ## Include the Makefile-Engine
DEVEL_DIRECTORY := \ DEVEL_DIRECTORY := \
src/data/settings/tracker_new_templates/Makefile
+29 -26
View File
@@ -1,45 +1,48 @@
## Haiku Generic Makefile v2.6 ## ## Haiku Generic Makefile v2.6 ##
## Fill in this file to specify the project being created, and the referenced ## Fill in this file to specify the project being created, and the referenced
## Makefile-Engine will do all of the hard work for you. This handles any ## Makefile-Engine will do all of the hard work for you. This handles any
## architecture of Haiku. ## architecture of Haiku.
##
## For more information, see:
## file:///system/develop/documentation/makefile-engine.html
# The name of the binary. # The name of the binary.
NAME = NAME =
# The type of binary, must be one of: # The type of binary, must be one of:
# APP: Application # APP: Application
# SHARED: Shared library or add-on # SHARED: Shared library or add-on
# STATIC: Static library archive # STATIC: Static library archive
# DRIVER: Kernel driver # DRIVER: Kernel driver
TYPE = TYPE =
# If you plan to use localization, specify the application's MIME signature. # If you plan to use localization, specify the application's MIME signature.
APP_MIME_SIG = APP_MIME_SIG =
# The following lines tell Pe and Eddie where the SRCS, RDEFS, and RSRCS are # The following lines tell Pe and Eddie where the SRCS, RDEFS, and RSRCS are
# so that Pe and Eddie can fill them in for you. # so that Pe and Eddie can fill them in for you.
#%{ #%{
# @src->@ # @src->@
# Specify the source files to use. Full paths or paths relative to the # Specify the source files to use. Full paths or paths relative to the
# Makefile can be included. All files, regardless of directory, will have # Makefile can be included. All files, regardless of directory, will have
# their object files created in the common object directory. Note that this # their object files created in the common object directory. Note that this
# means this Makefile will not work correctly if two source files with the # means this Makefile will not work correctly if two source files with the
# same name (source.c or source.cpp) are included from different directories. # same name (source.c or source.cpp) are included from different directories.
# Also note that spaces in folder names do not work well with this Makefile. # Also note that spaces in folder names do not work well with this Makefile.
SRCS = SRCS =
# Specify the resource definition files to use. Full or relative paths can be # Specify the resource definition files to use. Full or relative paths can be
# used. # used.
RDEFS = RDEFS =
# Specify the resource files to use. Full or relative paths can be used. # Specify the resource files to use. Full or relative paths can be used.
# Both RDEFS and RSRCS can be utilized in the same Makefile. # Both RDEFS and RSRCS can be utilized in the same Makefile.
RSRCS = RSRCS =
# End Pe/Eddie support. # End Pe/Eddie support.
# @<-src@ # @<-src@
#%} #%}
# Specify libraries to link against. # Specify libraries to link against.
@@ -54,65 +57,65 @@ RSRCS =
# - if your library does not follow the standard library naming scheme, # - if your library does not follow the standard library naming scheme,
# you need to specify the path to the library and it's name. # you need to specify the path to the library and it's name.
# (e.g. for mylib.a, specify "mylib.a" or "path/mylib.a") # (e.g. for mylib.a, specify "mylib.a" or "path/mylib.a")
LIBS = LIBS =
# Specify additional paths to directories following the standard libXXX.so # Specify additional paths to directories following the standard libXXX.so
# or libXXX.a naming scheme. You can specify full paths or paths relative # or libXXX.a naming scheme. You can specify full paths or paths relative
# to the Makefile. The paths included are not parsed recursively, so # to the Makefile. The paths included are not parsed recursively, so
# include all of the paths where libraries must be found. Directories where # include all of the paths where libraries must be found. Directories where
# source files were specified are automatically included. # source files were specified are automatically included.
LIBPATHS = LIBPATHS =
# Additional paths to look for system headers. These use the form # Additional paths to look for system headers. These use the form
# "#include <header>". Directories that contain the files in SRCS are # "#include <header>". Directories that contain the files in SRCS are
# NOT auto-included here. # NOT auto-included here.
SYSTEM_INCLUDE_PATHS = SYSTEM_INCLUDE_PATHS =
# Additional paths paths to look for local headers. These use the form # Additional paths paths to look for local headers. These use the form
# #include "header". Directories that contain the files in SRCS are # #include "header". Directories that contain the files in SRCS are
# automatically included. # automatically included.
LOCAL_INCLUDE_PATHS = LOCAL_INCLUDE_PATHS =
# Specify the level of optimization that you want. Specify either NONE (O0), # Specify the level of optimization that you want. Specify either NONE (O0),
# SOME (O1), FULL (O2), or leave blank (for the default optimization level). # SOME (O1), FULL (O3), or leave blank (for the default optimization level).
OPTIMIZE := OPTIMIZE :=
# Specify the codes for languages you are going to support in this # Specify the codes for languages you are going to support in this
# application. The default "en" one must be provided too. "make catkeys" # application. The default "en" one must be provided too. "make catkeys"
# will recreate only the "locales/en.catkeys" file. Use it as a template # will recreate only the "locales/en.catkeys" file. Use it as a template
# for creating catkeys for other languages. All localization files must be # for creating catkeys for other languages. All localization files must be
# placed in the "locales" subdirectory. # placed in the "locales" subdirectory.
LOCALES = LOCALES =
# Specify all the preprocessor symbols to be defined. The symbols will not # Specify all the preprocessor symbols to be defined. The symbols will not
# have their values set automatically; you must supply the value (if any) to # have their values set automatically; you must supply the value (if any) to
# use. For example, setting DEFINES to "DEBUG=1" will cause the compiler # use. For example, setting DEFINES to "DEBUG=1" will cause the compiler
# option "-DDEBUG=1" to be used. Setting DEFINES to "DEBUG" would pass # option "-DDEBUG=1" to be used. Setting DEFINES to "DEBUG" would pass
# "-DDEBUG" on the compiler's command line. # "-DDEBUG" on the compiler's command line.
DEFINES = DEFINES =
# Specify the warning level. Either NONE (suppress all warnings), # Specify the warning level. Either NONE (suppress all warnings),
# ALL (enable all warnings), or leave blank (enable default warnings). # ALL (enable all warnings), or leave blank (enable default warnings).
WARNINGS = WARNINGS =
# With image symbols, stack crawls in the debugger are meaningful. # With image symbols, stack crawls in the debugger are meaningful.
# If set to "TRUE", symbols will be created. # If set to "TRUE", symbols will be created.
SYMBOLS := SYMBOLS :=
# Includes debug information, which allows the binary to be debugged easily. # Includes debug information, which allows the binary to be debugged easily.
# If set to "TRUE", debug info will be created. # If set to "TRUE", debug info will be created.
DEBUGGER := DEBUGGER :=
# Specify any additional compiler flags to be used. # Specify any additional compiler flags to be used.
COMPILER_FLAGS = COMPILER_FLAGS =
# Specify any additional linker flags to be used. # Specify any additional linker flags to be used.
LINKER_FLAGS = LINKER_FLAGS =
# Specify the version of this binary. Example: # Specify the version of this binary. Example:
# -app 3 4 0 d 0 -short 340 -long "340 "`echo -n -e '\302\251'`"1999 GNU GPL" # -app 3 4 0 d 0 -short 340 -long "340 "`echo -n -e '\302\251'`"1999 GNU GPL"
# This may also be specified in a resource. # This may also be specified in a resource.
APP_VERSION := APP_VERSION :=
# (Only used when "TYPE" is "DRIVER"). Specify the desired driver install # (Only used when "TYPE" is "DRIVER"). Specify the desired driver install
# location in the /dev hierarchy. Example: # location in the /dev hierarchy. Example:
@@ -120,7 +123,7 @@ APP_VERSION :=
# will instruct the "driverinstall" rule to place a symlink to your driver's # will instruct the "driverinstall" rule to place a symlink to your driver's
# binary in ~/add-ons/kernel/drivers/dev/video/usb, so that your driver will # binary in ~/add-ons/kernel/drivers/dev/video/usb, so that your driver will
# appear at /dev/video/usb when loaded. The default is "misc". # appear at /dev/video/usb when loaded. The default is "misc".
DRIVER_PATH = DRIVER_PATH =
## Include the Makefile-Engine ## Include the Makefile-Engine
DEVEL_DIRECTORY := \ DEVEL_DIRECTORY := \