Skip to content

Commit

Permalink
- sed -i -e "/;$/s/;$//g" $(egrep ";$" package/* package/*/*.mk toolc…
Browse files Browse the repository at this point in the history
…hain/* toolchain/*/*.mk */Makefile.in -l)
  • Loading branch information
aldot committed Aug 21, 2007
1 parent 95783cd commit 6c6cb06
Show file tree
Hide file tree
Showing 169 changed files with 306 additions and 306 deletions.
4 changes: 2 additions & 2 deletions package/Makefile.autotools.in
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
# relative path in the package source from which to run configure and
# make
#
## The following variables contain hook target names;
## The following variables contain hook target names
## by default they do nothing, they can be overriden in package makefiles
#
# FOO_HOOK_POST_BUILD, FOO_HOOK_POST_INSTALL
Expand Down Expand Up @@ -192,7 +192,7 @@ $(BUILD_DIR)/%/.stamp_configured:
--exec-prefix=/usr \
--sysconfdir=/etc \
$($(PKG)_CONF_OPT)
touch $@;
touch $@

# Build
$(BUILD_DIR)/%/.stamp_built:
Expand Down
2 changes: 1 addition & 1 deletion package/alsa-lib/alsa-lib.mk
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ $(ALSA_LIB_DIR)/.configured: $(ALSA_LIB_DIR)/.unpacked
--enable-static \
--disable-docs \
$(DISABLE_NLS) \
);
)
touch $@

$(ALSA_LIB_DIR)/src/.libs/$(ALSA_LIB_BINARY): $(ALSA_LIB_DIR)/.configured
Expand Down
4 changes: 2 additions & 2 deletions package/alsa-utils/alsa-utils.mk
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ $(ALSA_UTILS_DIR)/.configured: $(ALSA_UTILS_DIR)/.unpacked
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
);
)
touch $@

$(ALSA_UTILS_DIR)/$(ALSA_UTILS_BINARY): $(ALSA_UTILS_DIR)/.configured
Expand Down Expand Up @@ -68,7 +68,7 @@ $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY): $(ALSA_UTILS_DIR)/$(ALSA_UTILS_BINARY
mkdir -p $(TARGET_DIR)/usr/share/sounds/alsa; \
cp -rdpf $(STAGING_DIR)/usr/share/alsa/speaker-test/* $(TARGET_DIR)/usr/share/alsa/speaker-test/; \
cp -rdpf $(STAGING_DIR)/usr/share/sounds/alsa/* $(TARGET_DIR)/usr/share/sounds/alsa/; \
fi;
fi
touch -c $@

alsa-utils: uclibc alsa-lib ncurses $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY)
Expand Down
2 changes: 1 addition & 1 deletion package/argus/argus.mk
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ $(ARGUS_DIR)/.configured: $(ARGUS_DIR)/.unpacked
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
$(DISABLE_LARGEFILE) \
);
)
touch $@

$(ARGUS_DIR)/$(ARGUS_BINARY): $(ARGUS_DIR)/.configured
Expand Down
2 changes: 1 addition & 1 deletion package/at/at.mk
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ $(AT_DIR)/.configured: $(AT_DIR)/.unpacked
--with-atspool=/var/lib/atspool \
--with-daemon_username=at \
--with-daemon_groupname=at \
);
)
touch $@

$(AT_DIR)/$(AT_BINARY): $(AT_DIR)/.configured
Expand Down
2 changes: 1 addition & 1 deletion package/atk/atk.mk
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ $(ATK_DIR)/.configured: $(ATK_DIR)/.unpacked
--disable-glibtest \
--enable-explicit-deps=no \
--disable-debug \
);
)
touch $(ATK_DIR)/.configured

$(ATK_DIR)/atk/.libs/$(ATK_BINARY): $(ATK_DIR)/.configured
Expand Down
2 changes: 1 addition & 1 deletion package/aumix/aumix.mk
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ $(AUMIX_DIR)/.configured: $(AUMIX_DIR)/.unpacked
--without-gpm \
--without-sysmouse \
$(DISABLE_NLS) \
);
)
touch $(AUMIX_DIR)/.configured

$(AUMIX_DIR)/src/aumix: $(AUMIX_DIR)/.configured
Expand Down
8 changes: 4 additions & 4 deletions package/autoconf/autoconf.mk
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ $(AUTOCONF_DIR)/.configured: $(AUTOCONF_SRC_DIR)/.unpacked
--localstatedir=/var \
--mandir=/usr/man \
--infodir=/usr/info \
);
)
touch $@

$(AUTOCONF_DIR)/bin/$(AUTOCONF_BINARY): $(AUTOCONF_DIR)/.configured
Expand All @@ -73,7 +73,7 @@ $(TARGET_DIR)/$(AUTOCONF_TARGET_BINARY): $(AUTOCONF_DIR)/bin/$(AUTOCONF_BINARY)
infodir=$(TARGET_DIR)/usr/info \
mandir=$(TARGET_DIR)/usr/man \
includedir=$(TARGET_DIR)/usr/include \
-C $(AUTOCONF_DIR) install;
-C $(AUTOCONF_DIR) install
rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
touch -c $@
Expand Down Expand Up @@ -102,14 +102,14 @@ $(AUTOCONF_HOST_DIR)/.configured: $(AUTOCONF_SRC_DIR)/.unpacked
EMACS="no" \
$(AUTOCONF_SRC_DIR)/configure \
--prefix=$(STAGING_DIR)/usr \
);
)
touch $@

$(AUTOCONF_HOST_DIR)/bin/$(AUTOCONF_BINARY): $(AUTOCONF_HOST_DIR)/.configured
$(MAKE1) -C $(AUTOCONF_HOST_DIR)

$(AUTOCONF): $(AUTOCONF_HOST_DIR)/bin/$(AUTOCONF_BINARY)
$(MAKE) -C $(AUTOCONF_HOST_DIR) install;
$(MAKE) -C $(AUTOCONF_HOST_DIR) install

host-autoconf: host-m4 host-libtool $(AUTOCONF)

Expand Down
4 changes: 2 additions & 2 deletions package/automake/automake.mk
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ $(AUTOMAKE_DIR)/.configured: $(AUTOMAKE_SRC_DIR)/.unpacked
--localstatedir=/var \
--mandir=/usr/man \
--infodir=/usr/info \
);
)
touch $@

$(AUTOMAKE_DIR)/$(AUTOMAKE_BINARY): $(AUTOMAKE_DIR)/.configured
Expand Down Expand Up @@ -105,7 +105,7 @@ $(AUTOMAKE_HOST_DIR)/.configured: $(AUTOMAKE_SRC_DIR)/.unpacked
WANT_AUTOCONF=2.5 \
$(AUTOMAKE_SRC_DIR)/configure \
--prefix=$(STAGING_DIR)/usr \
);
)
touch $@

$(AUTOMAKE_HOST_DIR)/$(AUTOMAKE_BINARY): $(AUTOMAKE_HOST_DIR)/.configured
Expand Down
4 changes: 2 additions & 2 deletions package/avahi/avahi.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# This program is free software; you can redistribute it
# and/or modify it under the terms of the GNU Lesser General
# Public License as published by the Free Software Foundation;
# Public License as published by the Free Software Foundation
# either version 2.1 of the License, or (at your option) any
# later version.

Expand Down Expand Up @@ -139,7 +139,7 @@ $(AVAHI_DIR)/.configured: $(AVAHI_DIR)/.unpacked $(AVAHI_EXPAT_DEP)
--with-avahi-group=default \
--with-autoipd-user=default \
--with-autoipd-group=default \
);
)
touch $@

$(AVAHI_DIR)/.compiled: $(AVAHI_DIR)/.configured
Expand Down
2 changes: 1 addition & 1 deletion package/bash/bash.mk
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked
--with-curses \
--enable-alias \
--without-bash-malloc \
);
)
touch $@

$(BASH_DIR)/$(BASH_BINARY): $(BASH_DIR)/.configured
Expand Down
2 changes: 1 addition & 1 deletion package/berkeleydb/berkeleydb.mk
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ $(DB_DIR)/.configured: $(DB_DIR)/.dist
--disable-compat185 \
--with-pic \
$(DISABLE_LARGEFILE) \
);
)
$(SED) 's/\.lo/.o/g' $(DB_DIR)/build_unix/Makefile
touch $(DB_DIR)/.configured

Expand Down
2 changes: 1 addition & 1 deletion package/bind/bind.mk
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ $(BIND_DIR2)/Makefile: $(BIND_DIR2)/.unpacked
$(DISABLE_IPV6) \
--with-libtool \
--with-pic \
);
)

$(BIND_DIR2)/$(BIND_BINARY): $(BIND_DIR2)/Makefile
$(MAKE) $(TARGET_CONFIGURE_OPTS) -j1 -C $(BIND_DIR2)
Expand Down
2 changes: 1 addition & 1 deletion package/bison/bison.mk
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ $(BISON_DIR)/.configured: $(BISON_DIR)/.unpacked
--mandir=/usr/man \
--infodir=/usr/info \
$(DISABLE_NLS) \
);
)
echo 'all install:' > $(BISON_DIR)/examples/Makefile
touch $(BISON_DIR)/.configured

Expand Down
4 changes: 2 additions & 2 deletions package/boa/boa.mk
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ $(BOA_WORKDIR)/Makefile: $(BOA_DIR)/.unpacked
--mandir=/usr/man \
--infodir=/usr/info \
$(DISABLE_NLS) \
);
)
touch $(BOA_WORKDIR)/Makefile

$(BOA_WORKDIR)/src/boa $(BOA_WORKDIR)/src/boa_indexer: $(BOA_WORKDIR)/Makefile
Expand All @@ -70,7 +70,7 @@ boa-source: $(DL_DIR)/$(BOA_SOURCE)
boa-clean:
@if [ -d $(BOA_WORKDIR)/Makefile ] ; then \
$(MAKE) -C $(BOA_WORKDIR) clean ; \
fi;
fi

boa-dirclean:
rm -rf $(BOA_DIR) $(BOA_WORKDIR)
Expand Down
2 changes: 1 addition & 1 deletion package/bridge/bridge.mk
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ $(BRIDGE_BUILD_DIR)/.configured: $(BRIDGE_BUILD_DIR)/.unpacked
--infodir=/usr/info \
$(DISABLE_NLS) \
--with-linux-headers=$(LINUX_HEADERS_DIR) \
);
)
touch $(BRIDGE_BUILD_DIR)/.configured

$(BRIDGE_BUILD_DIR)/brctl/brctl: $(BRIDGE_BUILD_DIR)/.configured
Expand Down
14 changes: 7 additions & 7 deletions package/busybox/busybox.mk
Original file line number Diff line number Diff line change
Expand Up @@ -47,26 +47,26 @@ endif
$(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE)
cp -f $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config
$(SED) s,^CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
$(BUSYBOX_DIR)/.config ;
$(BUSYBOX_DIR)/.config
ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_0_1)),y)
$(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\PREFIX=$(TARGET_DIR),;" \
$(BUSYBOX_DIR)/Rules.mak ;
$(BUSYBOX_DIR)/Rules.mak
endif
ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_1_3)),y)
$(SED) s,^PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
$(BUSYBOX_DIR)/.config ;
$(BUSYBOX_DIR)/.config
endif
ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_2_2_1)),y)
$(SED) s,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
$(BUSYBOX_DIR)/.config ;
$(BUSYBOX_DIR)/.config
$(SED) s,^PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
$(BUSYBOX_DIR)/.config ;
$(BUSYBOX_DIR)/.config
endif
ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
$(SED) s,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
$(BUSYBOX_DIR)/.config ;
$(BUSYBOX_DIR)/.config
$(SED) s,^PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
$(BUSYBOX_DIR)/.config ;
$(BUSYBOX_DIR)/.config
endif
ifeq ($(BR2_LARGEFILE),y)
$(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=y/;" $(BUSYBOX_DIR)/.config
Expand Down
2 changes: 1 addition & 1 deletion package/bzip2/bzip2.mk
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ $(BZIP2_BINARY): $(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VERSION)

$(BZIP2_TARGET_BINARY): $(BZIP2_BINARY)
(cd $(TARGET_DIR)/usr/bin; \
rm -f bzip2 bunzip2 bzcat bzip2recover bzgrep bzegrep bzfgrep bzmore bzless bzdiff bzcmp);
rm -f bzip2 bunzip2 bzcat bzip2recover bzgrep bzegrep bzfgrep bzmore bzless bzdiff bzcmp)
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(BZIP2_DIR) install
rm -f $(TARGET_DIR)/usr/lib/libbz2.a
Expand Down
4 changes: 2 additions & 2 deletions package/cairo/cairo.mk
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,15 @@ $(CAIRO_DIR)/.configured: $(CAIRO_DIR)/.unpacked
--enable-freetype=yes \
--enable-xlib=yes \
--enable-xlib-xrender=yes \
);
)
touch $(CAIRO_DIR)/.configured

$(CAIRO_DIR)/src/.libs/$(CAIRO_BINARY): $(CAIRO_DIR)/.configured
$(MAKE) CC=$(TARGET_CC) -C $(CAIRO_DIR)
touch -c $(CAIRO_DIR)/src/.libs/$(CAIRO_BINARY)

$(STAGING_DIR)/lib/$(CAIRO_BINARY): $(CAIRO_DIR)/src/.libs/$(CAIRO_BINARY)
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(CAIRO_DIR) install;
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(CAIRO_DIR) install
$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libcairo.la
touch -c $(STAGING_DIR)/lib/$(CAIRO_BINARY)

Expand Down
2 changes: 1 addition & 1 deletion package/coreutils/coreutils.mk
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ $(COREUTILS_DIR)/.configured: $(COREUTILS_DIR)/.unpacked
$(DISABLE_LARGEFILE) \
--disable-rpath \
--disable-dependency-tracking \
);
)
touch $@

$(COREUTILS_DIR)/$(COREUTILS_BINARY): $(COREUTILS_DIR)/.configured
Expand Down
2 changes: 1 addition & 1 deletion package/curl/curl.mk
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ $(CURL_DIR)/.configured: $(CURL_DIR)/.unpacked
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=$(STAGING_DIR) \
);
)
touch $(CURL_DIR)/.configured

$(CURL_DIR)/src/.libs/$(CURL_BINARY): $(CURL_DIR)/.configured
Expand Down
2 changes: 1 addition & 1 deletion package/cvs/cvs.mk
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ $(CVS_DIR)/.configured: $(CVS_DIR)/.unpacked
$(DISABLE_LARGEFILE) \
$(DISABLE_NLS) \
$(CVS_CONFIGURE_ARGS) \
);
)
touch $@

$(CVS_DIR)/$(CVS_BINARY): $(CVS_DIR)/.configured
Expand Down
2 changes: 1 addition & 1 deletion package/dash/dash.mk
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ $(DASH_DIR)/.configured: $(DASH_DIR)/.unpacked
--localstatedir=/var \
--mandir=/usr/man \
--infodir=/usr/info \
);
)
touch $(DASH_DIR)/.configured

$(DASH_DIR)/$(DASH_BINARY): $(DASH_DIR)/.configured
Expand Down
2 changes: 1 addition & 1 deletion package/dbus-glib/dbus-glib.mk
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ $(DBUS_GLIB_DIR)/.configured: $(DBUS_GLIB_DIR)/.unpacked /usr/bin/pkg-config
--disable-xml-docs \
--disable-doxygen-docs \
--enable-asserts=yes \
);
)
touch $(DBUS_GLIB_DIR)/.configured

$(DBUS_GLIB_DIR)/$(DBUS_GLIB_BINARY): $(DBUS_GLIB_DIR)/.configured
Expand Down
2 changes: 1 addition & 1 deletion package/dbus/dbus.mk
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ $(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked
--without-xml \
--with-system-socket=/var/run/dbus/system_bus_socket \
--with-system-pid-file=/var/run/messagebus.pid \
);
)
touch $@

$(DBUS_DIR)/$(DBUS_BINARY): $(DBUS_DIR)/.configured
Expand Down
2 changes: 1 addition & 1 deletion package/dhcp/dhcp.mk
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ $(DHCP_DIR)/.configured: $(DHCP_DIR)/.unpacked
(cd $(DHCP_DIR); \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
./configure );
./configure )
touch $(DHCP_DIR)/.configured

$(DHCP_DIR)/$(DHCP_RELAY_BINARY): $(DHCP_DIR)/.configured
Expand Down
2 changes: 1 addition & 1 deletion package/dialog/dialog.mk
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ $(DIALOG_DIR)/.configured: $(DIALOG_DIR)/.source
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
--sysconfdir=/etc \
);
)
touch $@

$(DIALOG_DIR)/$(DIALOG_BINARY): $(DIALOG_DIR)/.configured
Expand Down
2 changes: 1 addition & 1 deletion package/diffutils/diffutils.mk
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ $(DIFFUTILS_DIR)/.configured: $(DIFFUTILS_DIR)/.unpacked
--infodir=/usr/info \
$(DISABLE_NLS) \
$(DISABLE_LARGEFILE) \
);
)
touch $(DIFFUTILS_DIR)/.configured

$(DIFFUTILS_DIR)/$(DIFFUTILS_BINARY): $(DIFFUTILS_DIR)/.configured
Expand Down
4 changes: 2 additions & 2 deletions package/dillo/dillo.mk
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ $(DILLO_DIR)/.configured: $(DILLO_DIR)/.unpacked
--sysconfdir=/etc \
--program-transform-name='' \
--disable-dlgui \
);
)
touch $(DILLO_DIR)/.configured

$(DILLO_DIR)/src/dillo: $(DILLO_DIR)/.configured
Expand All @@ -46,7 +46,7 @@ dillo-source: $(DL_DIR)/$(DILLO_SOURCE)
dillo-clean:
@if [ -d $(DILLO_DIR)/Makefile ] ; then \
$(MAKE) -C $(DILLO_DIR) clean ; \
fi;
fi

dillo-dirclean:
rm -rf $(DILLO_DIR)
Expand Down
2 changes: 1 addition & 1 deletion package/directfb/directfb.mk
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ $(DIRECTFB_DIR)/.configured: $(DIRECTFB_DIR)/.unpacked
--disable-sdl \
--disable-video4linux \
--disable-video4linux2 \
--enable-fusion );
--enable-fusion )
touch $(DIRECTFB_DIR)/.configured

$(DIRECTFB_DIR)/.compiled: $(DIRECTFB_DIR)/.configured
Expand Down
2 changes: 1 addition & 1 deletion package/distcc/distcc.mk
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ $(DISTCC_DIR)/.configured: $(DISTCC_DIR)/.unpacked
--with-included-popt \
--without-gtk \
--without-gnome \
);
)
touch $(DISTCC_DIR)/.configured

$(DISTCC_DIR)/$(DISTCC_BINARY): $(DISTCC_DIR)/.configured
Expand Down
Loading

0 comments on commit 6c6cb06

Please sign in to comment.