jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-01 23:47:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

- whitespace cleanup (Cristian Ionescu-Idbohrn)

Browse Source
This commit is contained in:
Bernhard Reutner-Fischer 2007-09-30 12:46:02 +00:00
parent 28b852d9c3
commit 00b8456cd5
3 changed files with 42 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
package/Makefile.autotools.in
View File

@ -76,7 +76,7 @@
# in your package makefile:
#
# | $(FOO_TARGET_INSTALL):
# | touch $@
# | touch $@
#
## The following variables are defined automatically and can be used in
## overriden targets:
@ -90,7 +90,7 @@
# MESSAGE
# macro that outputs a pretty message to stdout, e.g. use
# $(call MESSAGE,"Hello World")
# in a target.
# in a target.
#
# Caveats:
# - the 'eval' line (final line in the example) must be placed
@ -110,7 +110,7 @@ INFLATE.tgz = $(ZCAT)
INFLATE.tar = cat
# MESSAGE Macro -- display a message in bold type
MESSAGE = @echo $(TERM_BOLD) ; \
MESSAGE = @echo $(TERM_BOLD); \
echo ">>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)"; \
echo $(TERM_RESET)
TERM_BOLD = #$(shell tput bold)
@ -152,14 +152,14 @@ $(BUILD_DIR)/%/.stamp_patched: NAMEVER = $($(PKG)_NAME)-$($(PKG)_VERSION)
$(BUILD_DIR)/%/.stamp_patched:
$(call MESSAGE,"Patching")
$(if $($(PKG)_PATCH),toolchain/patch-kernel.sh $(@D) $(DL_DIR) $($(PKG)_PATCH))
$(Q)(\
if test -d $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME) ; then \
if test "$(wildcard $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)/$(NAMEVER)*.patch)" ; then \
toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME) $(NAMEVER)\*.patch || exit 1 ; \
$(Q)( \
if test -d $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME); then \
if test "$(wildcard $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)/$(NAMEVER)*.patch)"; then \
toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME) $(NAMEVER)\*.patch || exit 1; \
else \
toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME) $($(PKG)_NAME)\*.patch || exit 1 ; \
if test -d package/$($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)/$(NAMEVER) ; then \
toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)/$(NAMEVER) \*.patch || exit 1 ; \
toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME) $($(PKG)_NAME)\*.patch || exit 1; \
if test -d package/$($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)/$(NAMEVER); then \
toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)/$(NAMEVER) \*.patch || exit 1; \
fi; \
fi; \
fi; \
@ -168,7 +168,7 @@ ifeq ($(strip $(BR2_UPDATE_CONFIG)),y)
$(Q)(for file in config.guess config.sub; do \
for i in $$(find $(@D) -name $$file); do \
cp package/gnuconfig/$$file $$i; \
done;\
done; \
done)
endif
$(Q)touch $@
@ -182,12 +182,10 @@ $(BUILD_DIR)/%/.stamp_autoconfigured:
# Configuring
$(BUILD_DIR)/%/.stamp_configured:
$(call MESSAGE,"Configuring")
$(Q)if test "$($(PKG)_AUTORECONF)" = "YES" ; then \
cd $(@D)/$($(PKG)_SUBDIR) && \
$(AUTORECONF) ; \
$(Q)if test "$($(PKG)_AUTORECONF)" = "YES"; then \
cd $(@D)/$($(PKG)_SUBDIR) && $(AUTORECONF); \
fi
cd $(@D)/$($(PKG)_SUBDIR) && \
rm -f config.cache && \
cd $(@D)/$($(PKG)_SUBDIR) && rm -f config.cache && \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
$($(PKG)_CONF_ENV) \
@ -212,9 +210,9 @@ $(BUILD_DIR)/%/.stamp_staging_installed:
$(call MESSAGE,'Installing to host (staging directory)')
$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_INSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR)
# toolchain/replace.sh $(STAGING_DIR)/usr/lib ".*\.la" "\(['= ]\)/usr" "\\1$(STAGING_DIR)/usr"
for i in $$(find $(STAGING_DIR)/usr/lib/ -name "*.la") ; do \
cp $$i $$i~ ; \
$(SED) "s:\(['= ]\)/usr:\\1$(STAGING_DIR)/usr:" $$i ; \
for i in $$(find $(STAGING_DIR)/usr/lib/ -name "*.la"); do \
cp $$i $$i~; \
$(SED) "s:\(['= ]\)/usr:\\1$(STAGING_DIR)/usr:" $$i; \
done
touch $@
@ -222,14 +220,14 @@ $(BUILD_DIR)/%/.stamp_staging_installed:
$(BUILD_DIR)/%/.stamp_target_installed:
$(call MESSAGE,"Installing to target")
$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_INSTALL_TARGET_OPT) -C $(@D)/$($(PKG)_SUBDIR)
$(if $(BR2_HAVE_MANPAGES),,for d in man ; do \
rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d ; \
$(if $(BR2_HAVE_MANPAGES),,for d in man; do \
rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d; \
done)
$(if $(BR2_HAVE_INFOPAGES),,for d in info share/info ; do \
rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d ; \
$(if $(BR2_HAVE_INFOPAGES),,for d in info share/info; do \
rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d; \
done)
$(if $(BR2_HAVE_INCLUDES),,for d in include ; do \
rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d ; \
$(if $(BR2_HAVE_INCLUDES),,for d in include; do \
rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d; \
done)
find $(TARGET_DIR) -name '*.la' -delete
touch $@
@ -304,8 +302,8 @@ $(2)_HOOK_POST_BUILD = $$($(2)_DIR)/.stamp_hook_post_build
$(2)_HOOK_POST_INSTALL = $$($(2)_DIR)/.stamp_hook_post_install
# human-friendly targets and target sequencing
$(1): $(1)-install
$(1)-install: $(1)-install-staging $(1)-install-target \
$(1): $(1)-install
$(1)-install: $(1)-install-staging $(1)-install-target \
$$($(2)_HOOK_POST_INSTALL)
ifeq ($$($(2)_INSTALL_TARGET),YES)
@ -342,7 +340,7 @@ $(1)-depends: $(1)-source $$($(2)_DEPENDENCIES)
$(1)-source: $$($(2)_TARGET_SOURCE)
# non-build targets
$(1)-uninstall: $(1)-configure $$($(2)_TARGET_UNINSTALL)
$(1)-uninstall: $(1)-configure $$($(2)_TARGET_UNINSTALL)
$(1)-clean: $$($(2)_TARGET_CLEAN)
@ -377,4 +375,3 @@ endif
endef
# :mode=makefile:

1
project/project.mk
View File

@ -53,4 +53,3 @@ vendor-dbg:
@echo VENDOR_UCLIBC_RELEASE=$(BR2_VENDOR_UCLIBC_RELEASE)
@echo VENDOR_GDB_RELEASE=$(BR2_VENDOR_GDB_RELEASE)
@echo VENDOR_PATCH_DIR=$(BR2_VENDOR_PATCH_DIR)

2
toolchain/gcc/gcc-uclibc-3.x.mk
View File

@ -358,7 +358,7 @@ cross_compiler gcc: gcc-config $(GCC_BUILD_DIR2)/.installed $(GCC_BUILD_DIR2)/.l
gcc-source: $(DL_DIR)/$(GCC_SOURCE)
gcc-config:uclibc-configured binutils gcc_initial $(LIBFLOAT_TARGET) \
gcc-config: uclibc-configured binutils gcc_initial $(LIBFLOAT_TARGET) \
uclibc $(GCC_BUILD_DIR2)/.configured
gcc-clean: