dce5809eb
Mike Frysinger
2006-03-23
Subject
make the makefile a little more flexible so we can store in either location
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
networking/udhcp/Makefile+4 -35
| @@ -1,36 +1,5 @@ | |
| - | # Makefile for busybox |
| - | # |
| - | # Copyright (C) 1999-2004 by Erik Andersen <[email protected]> |
| - | # |
| - | # This program is free software; you can redistribute it and/or modify |
| - | # it under the terms of the GNU General Public License as published by |
| - | # the Free Software Foundation; either version 2 of the License, or |
| - | # (at your option) any later version. |
| - | # |
| - | # This program is distributed in the hope that it will be useful, |
| - | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
| - | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| - | # General Public License for more details. |
| - | # |
| - | # You should have received a copy of the GNU General Public License |
| - | # along with this program; if not, write to the Free Software |
| - | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| - | # |
| - | |
| - | ifndef top_srcdir |
| - | top_srcdir=../.. |
| + | ifneq ($(wildcard ../../networking/Config.in),) |
| + | include Makefile.busybox |
| + | else |
| + | include Makefile.udhcp |
| endif | |
| - | ifndef top_builddir |
| - | top_builddir=../.. |
| - | endif |
| - | srcdir=$(top_srcdir)/networking/udhcp |
| - | UDHCP_DIR:=./ |
| - | include $(top_builddir)/Rules.mak |
| - | include $(top_builddir)/.config |
| - | include Makefile.in |
| - | all: $(libraries-y) |
| - | -include $(top_builddir)/.depend |
| - | |
| - | clean: |
| - | rm -f *.o *.a $(AR_TARGET) |
| - | |
networking/udhcp/Makefile.busybox+36 -0
| @@ -0,0 +1,36 @@ | |
| + | # Makefile for busybox |
| + | # |
| + | # Copyright (C) 1999-2004 by Erik Andersen <[email protected]> |
| + | # |
| + | # This program is free software; you can redistribute it and/or modify |
| + | # it under the terms of the GNU General Public License as published by |
| + | # the Free Software Foundation; either version 2 of the License, or |
| + | # (at your option) any later version. |
| + | # |
| + | # This program is distributed in the hope that it will be useful, |
| + | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
| + | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| + | # General Public License for more details. |
| + | # |
| + | # You should have received a copy of the GNU General Public License |
| + | # along with this program; if not, write to the Free Software |
| + | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| + | # |
| + | |
| + | ifndef top_srcdir |
| + | top_srcdir=../.. |
| + | endif |
| + | ifndef top_builddir |
| + | top_builddir=../.. |
| + | endif |
| + | srcdir=$(top_srcdir)/networking/udhcp |
| + | UDHCP_DIR:=./ |
| + | include $(top_builddir)/Rules.mak |
| + | include $(top_builddir)/.config |
| + | include Makefile.in |
| + | all: $(libraries-y) |
| + | -include $(top_builddir)/.depend |
| + | |
| + | clean: |
| + | rm -f *.o *.a $(AR_TARGET) |
| + | |