diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-10 19:00:38 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-10 19:00:38 +0100 |
commit | 2519557c8dbd0a902d89dbced3e85463880babb1 (patch) | |
tree | 4dab7f456bd749c3ce62adc9c3d8f24e7c863bf8 /config/Makefile | |
parent | 7de93724af9791bad0a8e887d02bf7a3a872305c (diff) | |
parent | fadb47884308490085a33d3fb1e857a0f5e5d748 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'config/Makefile')
-rw-r--r-- | config/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/config/Makefile b/config/Makefile index 97a8f3a3a..1f3143e34 100644 --- a/config/Makefile +++ b/config/Makefile @@ -31,6 +31,7 @@ ifeq (/usr/include/ncurses.h, $(wildcard /usr/include/ncurses.h)) HOSTNCURSES+= -DCURSES_LOC="<ncurses.h>" else HOSTNCURSES+= -DCURSES_LOC="<curses.h>" +LIBS= -lcurses endif endif endif @@ -47,16 +48,16 @@ MCONF_OBJS=$(patsubst %.c,%.o, $(MCONF_SRC)) SHARED_OBJS=$(patsubst %.c,%.o, $(SHARED_SRC)) conf: $(CONF_OBJS) $(SHARED_OBJS) - $(HOSTCC) -DKBUILD_NO_NLS $(NATIVE_LDFLAGS) $^ -o $@ + $(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $^ -o $@ mconf: $(MCONF_OBJS) $(SHARED_OBJS) - $(HOSTCC) -DKBUILD_NO_NLS $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS) + $(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS) $(CONF_OBJS): %.o : %.c $(SHARED_DEPS) - $(HOSTCC) -DKBUILD_NO_NLS $(HOSTCFLAGS) -I. -c $< -o $@ + $(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@ $(MCONF_OBJS): %.o : %.c $(SHARED_DEPS) - $(HOSTCC) -DKBUILD_NO_NLS $(HOSTCFLAGS) $(HOSTNCURSES) -I. -c $< -o $@ + $(HOSTCC) $(HOSTCFLAGS) $(HOSTNCURSES) -I. -c $< -o $@ glob.o: glob.c $(SHARED_DEPS) $(HOSTCC) $(HOSTCFLAGS) -I. -c glob.c -o $@ |