diff options
Diffstat (limited to 'miscutils')
| -rw-r--r-- | miscutils/Makefile | 10 | ||||
| -rw-r--r-- | miscutils/Makefile.in | 7 |
2 files changed, 11 insertions, 6 deletions
diff --git a/miscutils/Makefile b/miscutils/Makefile index 4bae72476..ac427dc09 100644 --- a/miscutils/Makefile +++ b/miscutils/Makefile | |||
| @@ -17,13 +17,15 @@ | |||
| 17 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 17 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 18 | # | 18 | # |
| 19 | 19 | ||
| 20 | TOPDIR:= ../ | 20 | top_srcdir=.. |
| 21 | top_builddir=.. | ||
| 22 | srcdir=$(top_srcdir)/miscutils | ||
| 21 | MISCUTILS_DIR:=./ | 23 | MISCUTILS_DIR:=./ |
| 22 | include $(TOPDIR).config | 24 | include $(top_builddir)/Rules.mak |
| 23 | include $(TOPDIR)Rules.mak | 25 | include $(top_builddir)/.config |
| 24 | include Makefile.in | 26 | include Makefile.in |
| 25 | all: $(libraries-y) | 27 | all: $(libraries-y) |
| 26 | -include $(TOPDIR).depend | 28 | -include $(top_builddir)/.depend |
| 27 | 29 | ||
| 28 | clean: | 30 | clean: |
| 29 | rm -f *.o *.a $(AR_TARGET) | 31 | rm -f *.o *.a $(AR_TARGET) |
diff --git a/miscutils/Makefile.in b/miscutils/Makefile.in index 89e3208a6..ddddf72b3 100644 --- a/miscutils/Makefile.in +++ b/miscutils/Makefile.in | |||
| @@ -19,9 +19,9 @@ | |||
| 19 | 19 | ||
| 20 | MISCUTILS_AR:=miscutils.a | 20 | MISCUTILS_AR:=miscutils.a |
| 21 | ifndef $(MISCUTILS_DIR) | 21 | ifndef $(MISCUTILS_DIR) |
| 22 | MISCUTILS_DIR:=$(TOPDIR)miscutils/ | 22 | MISCUTILS_DIR:=$(top_builddir)/miscutils/ |
| 23 | endif | 23 | endif |
| 24 | 24 | srcdir=$(top_srcdir)/miscutils | |
| 25 | 25 | ||
| 26 | MISCUTILS-y:= | 26 | MISCUTILS-y:= |
| 27 | MISCUTILS-$(CONFIG_ADJTIMEX) += adjtimex.o | 27 | MISCUTILS-$(CONFIG_ADJTIMEX) += adjtimex.o |
| @@ -50,3 +50,6 @@ endif | |||
| 50 | $(MISCUTILS_DIR)$(MISCUTILS_AR): $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y)) | 50 | $(MISCUTILS_DIR)$(MISCUTILS_AR): $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y)) |
| 51 | $(AR) -ro $@ $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y)) | 51 | $(AR) -ro $@ $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y)) |
| 52 | 52 | ||
| 53 | $(MISCUTILS_DIR)%.o: $(srcdir)/%.c | ||
| 54 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< | ||
| 55 | |||
