topaLE
/
ni-buildsystem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

- fix some make/$(MAKE) issues

master
vanhofen 5 years ago
parent
4c9120a966
commit
6bb576901f
6 changed files with 23 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      make/ni.mk
  2. 2
      make/target-ffmpeg-coolstream.mk
  3. 2
      make/target-ffmpeg.mk
  4. 2
      make/target-libs-unused.mk
  5. 30
      make/target-libs.mk
  6. 6
      make/target-tools.mk

4
make/ni.mk
View File

@ -43,11 +43,11 @@ ni-image:
$(MAKE) ntfs-3g $(MAKE) ntfs-3g
$(MAKE) exfat-utils $(MAKE) exfat-utils
$(MAKE) vsftpd $(MAKE) vsftpd
$(MAKE) djmount make djmount
$(MAKE) ushare $(MAKE) ushare
$(MAKE) xupnpd $(MAKE) xupnpd
make inadyn make inadyn
$(MAKE) samba make samba
make dropbear make dropbear
$(MAKE) hdparm $(MAKE) hdparm
$(MAKE) busybox $(MAKE) busybox

2
make/target-ffmpeg-coolstream.mk
View File

@ -182,7 +182,7 @@ ffmpeg: $(FFMPEG_DEPS) | $(TARGET_DIR)
$(FFMPEG_CONFIGURE_BRANCH) \ $(FFMPEG_CONFIGURE_BRANCH) \
; \ ; \
$(MAKE); \ $(MAKE); \
make install DESTDIR=$(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR)
$(REWRITE_PKGCONF_PC) $(REWRITE_PKGCONF_PC)
$(REMOVE)/$(NI-FFMPEG) $(REMOVE)/$(NI-FFMPEG)
$(TOUCH) $(TOUCH)

2
make/target-ffmpeg.mk
View File

@ -364,7 +364,7 @@ endif
$(FFMPEG_CONFIGURE_PLATFORM) \ $(FFMPEG_CONFIGURE_PLATFORM) \
; \ ; \
$(MAKE); \ $(MAKE); \
make install DESTDIR=$(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR)
$(REWRITE_PKGCONF_PC) $(REWRITE_PKGCONF_PC)
$(REMOVE)/$(FFMPEG_TMP) $(REMOVE)/$(FFMPEG_TMP)
$(TOUCH) $(TOUCH)

2
make/target-libs-unused.mk
View File

@ -58,7 +58,7 @@ libFLAC: $(ARCHIVE)/$(FLAC_SOURCE) | $(TARGET_DIR)
--disable-altivec \ --disable-altivec \
; \ ; \
$(MAKE) all; \ $(MAKE) all; \
make install DESTDIR=$(TARGET_DIR); \ $(MAKE) install DESTDIR=$(TARGET_DIR); \
$(REWRITE_LIBTOOL_LA) $(REWRITE_LIBTOOL_LA)
$(REWRITE_PKGCONF_PC) $(REWRITE_PKGCONF_PC)
rm -rf $(TARGET_DIR)/bin/flac rm -rf $(TARGET_DIR)/bin/flac

30
make/target-libs.mk
View File

@ -114,7 +114,7 @@ libdvbsi: | $(TARGET_DIR)
--disable-static \ --disable-static \
; \ ; \
$(MAKE); \ $(MAKE); \
make install DESTDIR=$(TARGET_DIR); \ $(MAKE) install DESTDIR=$(TARGET_DIR); \
$(REWRITE_LIBTOOL_LA) $(REWRITE_LIBTOOL_LA)
$(REWRITE_PKGCONF_PC) $(REWRITE_PKGCONF_PC)
$(REMOVE)/$(LIBDVBSI_TMP) $(REMOVE)/$(LIBDVBSI_TMP)
@ -136,7 +136,7 @@ giflib: $(ARCHIVE)/$(GIFLIB_SOURCE) | $(TARGET_DIR)
$(CHDIR)/$(GIFLIB_TMP); \ $(CHDIR)/$(GIFLIB_TMP); \
$(MAKE_ENV) \ $(MAKE_ENV) \
$(MAKE); \ $(MAKE); \
make install-include install-lib DESTDIR=$(TARGET_DIR) PREFIX= $(MAKE) install-include install-lib DESTDIR=$(TARGET_DIR) PREFIX=
$(REMOVE)/$(GIFLIB_TMP) $(REMOVE)/$(GIFLIB_TMP)
$(TOUCH) $(TOUCH)
@ -355,9 +355,9 @@ openssl: $(ARCHIVE)/$(OPENSSL_SOURCE) | $(TARGET_DIR)
sed -i "s| build_tests||" Makefile; \ sed -i "s| build_tests||" Makefile; \
sed -i 's|^MANDIR=.*|MANDIR=$(remove-mandir)|' Makefile; \ sed -i 's|^MANDIR=.*|MANDIR=$(remove-mandir)|' Makefile; \
sed -i 's|^HTMLDIR=.*|HTMLDIR=$(remove-htmldir)|' Makefile; \ sed -i 's|^HTMLDIR=.*|HTMLDIR=$(remove-htmldir)|' Makefile; \
make depend; \ $(MAKE) depend; \
make; \ $(MAKE); \
make install_sw INSTALL_PREFIX=$(TARGET_DIR) $(MAKE) install_sw INSTALL_PREFIX=$(TARGET_DIR)
$(REWRITE_PKGCONF_PC) $(REWRITE_PKGCONF_PC)
rm -rf $(TARGET_LIB_DIR)/engines rm -rf $(TARGET_LIB_DIR)/engines
rm -f $(TARGET_BIN_DIR)/c_rehash rm -f $(TARGET_BIN_DIR)/c_rehash
@ -433,7 +433,7 @@ openthreads: $(SOURCE_DIR)/$(NI-OPENTHREADS) | $(TARGET_DIR)
-D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE="0" \ -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE="0" \
; \ ; \
$(MAKE); \ $(MAKE); \
make install DESTDIR=$(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR)
rm -f $(TARGET_LIB_DIR)/cmake rm -f $(TARGET_LIB_DIR)/cmake
$(REMOVE)/$(NI-OPENTHREADS) $(REMOVE)/$(NI-OPENTHREADS)
$(REWRITE_PKGCONF_PC) $(REWRITE_PKGCONF_PC)
@ -458,7 +458,7 @@ libusb: $(ARCHIVE)/$(LIBUSB_SOURCE) | $(TARGET_DIR)
--disable-udev \ --disable-udev \
; \ ; \
$(MAKE); \ $(MAKE); \
make install DESTDIR=$(TARGET_DIR); \ $(MAKE) install DESTDIR=$(TARGET_DIR); \
$(REWRITE_LIBTOOL_LA) $(REWRITE_LIBTOOL_LA)
$(REWRITE_PKGCONF_PC) $(REWRITE_PKGCONF_PC)
$(REMOVE)/$(LIBUSB_TMP) $(REMOVE)/$(LIBUSB_TMP)
@ -487,7 +487,7 @@ libusb-compat: $(LUBUSB-COMPAT_DEPS) $(ARCHIVE)/$(LIBUSB-COMPAT_SOURCE) | $(TARG
--prefix= \ --prefix= \
; \ ; \
$(MAKE); \ $(MAKE); \
make install DESTDIR=$(TARGET_DIR); \ $(MAKE) install DESTDIR=$(TARGET_DIR); \
mv $(TARGET_BIN_DIR)/libusb-config $(HOST_DIR)/bin mv $(TARGET_BIN_DIR)/libusb-config $(HOST_DIR)/bin
$(REWRITE_CONFIG) $(HOST_DIR)/bin/libusb-config $(REWRITE_CONFIG) $(HOST_DIR)/bin/libusb-config
$(REWRITE_LIBTOOL_LA) $(REWRITE_LIBTOOL_LA)
@ -632,7 +632,7 @@ expat: $(ARCHIVE)/$(EXPAT_SOURCE) | $(TARGET_DIR)
--without-xmlwf \ --without-xmlwf \
; \ ; \
$(MAKE); \ $(MAKE); \
make install DESTDIR=$(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR)
$(REWRITE_LIBTOOL_LA) $(REWRITE_LIBTOOL_LA)
$(REWRITE_PKGCONF_PC) $(REWRITE_PKGCONF_PC)
$(REMOVE)/$(EXPAT_TMP) $(REMOVE)/$(EXPAT_TMP)
@ -963,8 +963,8 @@ rtmpdump: $(RTMPDUMP_DEPS) $(SOURCE_DIR)/$(NI-RTMPDUMP) | $(TARGET_DIR)
$(REMOVE)/$(NI-RTMPDUMP) $(REMOVE)/$(NI-RTMPDUMP)
tar -C $(SOURCE_DIR) -cp $(NI-RTMPDUMP) --exclude-vcs | tar -C $(BUILD_TMP) -x tar -C $(SOURCE_DIR) -cp $(NI-RTMPDUMP) --exclude-vcs | tar -C $(BUILD_TMP) -x
$(CHDIR)/$(NI-RTMPDUMP); \ $(CHDIR)/$(NI-RTMPDUMP); \
make $(RTMPDUMP_MAKE_OPTS) CROSS_COMPILE=$(TARGET_CROSS) XCFLAGS="$(TARGET_CFLAGS)" XLDFLAGS="$(TARGET_LDFLAGS)"; \ $(MAKE) $(RTMPDUMP_MAKE_OPTS) CROSS_COMPILE=$(TARGET_CROSS) XCFLAGS="$(TARGET_CFLAGS)" XLDFLAGS="$(TARGET_LDFLAGS)"; \
make $(RTMPDUMP_MAKE_OPTS) install DESTDIR=$(TARGET_DIR) $(MAKE) $(RTMPDUMP_MAKE_OPTS) install DESTDIR=$(TARGET_DIR)
rm -rf $(TARGET_DIR)/sbin/rtmpgw rm -rf $(TARGET_DIR)/sbin/rtmpgw
rm -rf $(TARGET_DIR)/sbin/rtmpsrv rm -rf $(TARGET_DIR)/sbin/rtmpsrv
rm -rf $(TARGET_DIR)/sbin/rtmpsuck rm -rf $(TARGET_DIR)/sbin/rtmpsuck
@ -1093,7 +1093,7 @@ libmad: $(ARCHIVE)/$(LIBMAD_SOURCE) | $(TARGET_DIR)
--enable-sso \ --enable-sso \
; \ ; \
$(MAKE) all; \ $(MAKE) all; \
make install DESTDIR=$(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR)
$(REWRITE_LIBTOOL_LA) $(REWRITE_LIBTOOL_LA)
$(REWRITE_PKGCONF_PC) $(REWRITE_PKGCONF_PC)
$(REMOVE)/$(LIBMAD_TMP) $(REMOVE)/$(LIBMAD_TMP)
@ -1120,8 +1120,8 @@ libvorbisidec: $(LIBVORBISIDEC_DEPS) $(ARCHIVE)/$(LIBVORBISIDEC_SOURCE) | $(TARG
$(CONFIGURE) \ $(CONFIGURE) \
--prefix= \ --prefix= \
; \ ; \
make all; \ $(MAKE) all; \
make install DESTDIR=$(TARGET_DIR); \ $(MAKE) install DESTDIR=$(TARGET_DIR); \
$(REWRITE_LIBTOOL_LA) $(REWRITE_LIBTOOL_LA)
$(REWRITE_PKGCONF_PC) $(REWRITE_PKGCONF_PC)
$(REMOVE)/$(LIBVORBISIDEC_TMP) $(REMOVE)/$(LIBVORBISIDEC_TMP)
@ -1147,7 +1147,7 @@ libogg: $(ARCHIVE)/$(LIBOGG_SOURCE) | $(TARGET_DIR)
--enable-shared \ --enable-shared \
; \ ; \
$(MAKE); \ $(MAKE); \
make install DESTDIR=$(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR)
$(REWRITE_LIBTOOL_LA) $(REWRITE_LIBTOOL_LA)
$(REWRITE_PKGCONF_PC) $(REWRITE_PKGCONF_PC)
$(REMOVE)/$(LIBOGG_TMP) $(REMOVE)/$(LIBOGG_TMP)

6
make/target-tools.mk
View File

@ -527,8 +527,8 @@ djmount: $(DJMOUNT_DEPS) $(ARCHIVE)/$(DJMOUNT_SOURCE) | $(TARGET_DIR)
--prefix= \ --prefix= \
--disable-debug \ --disable-debug \
; \ ; \
make; \ $(MAKE); \
make install DESTDIR=$(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR)
$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/djmount.init $(TARGET_DIR)/etc/init.d/djmount $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/djmount.init $(TARGET_DIR)/etc/init.d/djmount
$(UPDATE-RC.D) djmount defaults 75 25 $(UPDATE-RC.D) djmount defaults 75 25
$(REMOVE)/$(DJMOUNT_TMP) $(REMOVE)/$(DJMOUNT_TMP)
@ -1239,7 +1239,7 @@ lcd4linux: $(LCD4LINUX_DEPS) | $(TARGET_DIR)
$(MAKE) all; \ $(MAKE) all; \
$(MAKE) install $(MAKE) install
$(INSTALL_COPY) $(TARGET_FILES)/lcd4linux/* $(TARGET_DIR)/ $(INSTALL_COPY) $(TARGET_FILES)/lcd4linux/* $(TARGET_DIR)/
#make samsunglcd4linux #$(MAKE) samsunglcd4linux
$(REMOVE)/$(LCD4LINUX_TMP) $(REMOVE)/$(LCD4LINUX_TMP)
$(TOUCH) $(TOUCH)

Write Preview
Loading…
Cancel
Save