Diff for /embedaddon/dnsmasq/Makefile between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2014/06/15 16:31:38 version 1.1.1.3, 2016/11/02 09:57:01
Line 1 Line 1
# dnsmasq is Copyright (c) 2000-2014 Simon Kelley# dnsmasq is Copyright (c) 2000-2016 Simon Kelley
 #  #
 #  This program is free software; you can redistribute it and/or modify  #  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  #  it under the terms of the GNU General Public License as published by
Line 61  lua_cflags =    `echo $(COPTS) | $(top)/bld/pkg-wrappe Line 61  lua_cflags =    `echo $(COPTS) | $(top)/bld/pkg-wrappe
 lua_libs =      `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.1  lua_libs =      `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.1
 nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --cflags nettle hogweed`  nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --cflags nettle hogweed`
 nettle_libs =   `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --libs nettle hogweed`  nettle_libs =   `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --libs nettle hogweed`
gmp_libs =      `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --copy -lgmp`gmp_libs =      `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC NO_GMP --copy -lgmp`
 sunos_libs =    `if uname | grep SunOS >/dev/null 2>&1; then echo -lsocket -lnsl -lposix4; fi`  sunos_libs =    `if uname | grep SunOS >/dev/null 2>&1; then echo -lsocket -lnsl -lposix4; fi`
 version =     -DVERSION='\"`$(top)/bld/get-version $(top)`\"'  version =     -DVERSION='\"`$(top)/bld/get-version $(top)`\"'
   
   sum?=$(shell $(CC) -DDNSMASQ_COMPILE_OPTS $(COPTS) -E $(top)/$(SRC)/dnsmasq.h | ( md5sum 2>/dev/null || md5 ) | cut -f 1 -d ' ')
   sum!=$(CC) -DDNSMASQ_COMPILE_OPTS $(COPTS) -E $(top)/$(SRC)/dnsmasq.h | ( md5sum 2>/dev/null || md5 ) | cut -f 1 -d ' '
   copts_conf = .copts_$(sum)
   
 objs = cache.o rfc1035.o util.o option.o forward.o network.o \  objs = cache.o rfc1035.o util.o option.o forward.o network.o \
        dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o \         dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o \
        helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o \         helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o \
        dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o \         dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o \
       domain.o dnssec.o blockdata.o       domain.o dnssec.o blockdata.o tables.o loop.o inotify.o \
        poll.o rrfilter.o edns0.o arp.o
   
 hdrs = dnsmasq.h config.h dhcp-protocol.h dhcp6-protocol.h \  hdrs = dnsmasq.h config.h dhcp-protocol.h dhcp6-protocol.h \
        dns-protocol.h radv-protocol.h ip6addr.h         dns-protocol.h radv-protocol.h ip6addr.h
Line 83  all : $(BUILDDIR) Line 88  all : $(BUILDDIR)
   
 mostly_clean :  mostly_clean :
         rm -f $(BUILDDIR)/*.mo $(BUILDDIR)/*.pot           rm -f $(BUILDDIR)/*.mo $(BUILDDIR)/*.pot 
        rm -f $(BUILDDIR)/.configured $(BUILDDIR)/*.o $(BUILDDIR)/dnsmasq.a $(BUILDDIR)/dnsmasq         rm -f $(BUILDDIR)/.copts_* $(BUILDDIR)/*.o $(BUILDDIR)/dnsmasq.a $(BUILDDIR)/dnsmasq
   
 clean : mostly_clean  clean : mostly_clean
         rm -f $(BUILDDIR)/dnsmasq_baseline          rm -f $(BUILDDIR)/dnsmasq_baseline
Line 113  install-i18n : all-i18n install-common Line 118  install-i18n : all-i18n install-common
         cd $(MAN); ../bld/install-man $(DESTDIR)$(MANDIR) $(INSTALL)          cd $(MAN); ../bld/install-man $(DESTDIR)$(MANDIR) $(INSTALL)
   
 merge :   merge : 
        @cd $(BUILDDIR) && $(MAKE) -f $(top)/Makefile dnsmasq.pot        @cd $(BUILDDIR) && $(MAKE) top="$(top)" -f $(top)/Makefile dnsmasq.pot
         for f in `cd $(PO); echo *.po`; do \          for f in `cd $(PO); echo *.po`; do \
                 echo -n msgmerge $(PO)/$$f && $(MSGMERGE) --no-wrap -U $(PO)/$$f $(BUILDDIR)/dnsmasq.pot; \                  echo -n msgmerge $(PO)/$$f && $(MSGMERGE) --no-wrap -U $(PO)/$$f $(BUILDDIR)/dnsmasq.pot; \
         done          done
Line 139  bloatcheck : $(BUILDDIR)/dnsmasq_baseline mostly_clean Line 144  bloatcheck : $(BUILDDIR)/dnsmasq_baseline mostly_clean
   
 # rules below are targets in recusive makes with cwd=$(BUILDDIR)  # rules below are targets in recusive makes with cwd=$(BUILDDIR)
   
.configured: $(hdrs)$(copts_conf): $(hdrs)
        @rm -f *.o        @rm -f *.o .copts_*
         @touch $@          @touch $@
   
 $(objs:.o=.c) $(hdrs):  $(objs:.o=.c) $(hdrs):
         ln -s $(top)/$(SRC)/$@ .          ln -s $(top)/$(SRC)/$@ .
   
   $(objs): $(copts_conf) $(hdrs)
   
 .c.o:  .c.o:
         $(CC) $(CFLAGS) $(COPTS) $(i18n) $(build_cflags) $(RPM_OPT_FLAGS) -c $<           $(CC) $(CFLAGS) $(COPTS) $(i18n) $(build_cflags) $(RPM_OPT_FLAGS) -c $< 
   
dnsmasq : .configured $(hdrs) $(objs)dnsmasq : $(objs)
         $(CC) $(LDFLAGS) -o $@ $(objs) $(build_libs) $(LIBS)           $(CC) $(LDFLAGS) -o $@ $(objs) $(build_libs) $(LIBS) 
   
 dnsmasq.pot : $(objs:.o=.c) $(hdrs)  dnsmasq.pot : $(objs:.o=.c) $(hdrs)

Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>