[BACK]Return to Makefile CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / dnsmasq

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

version 1.1.1.1, 2013/07/29 19:37:40 version 1.1.1.2, 2014/06/15 16:31:38
Line 1 Line 1
# dnsmasq is Copyright (c) 2000-2013 Simon Kelley# dnsmasq is Copyright (c) 2000-2014 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 51  top!=pwd Line 51  top!=pwd
 # GNU make way.  # GNU make way.
 top?=$(CURDIR)  top?=$(CURDIR)
   
dbus_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DBUS $(PKG_CONFIG) --cflags dbus-1` dbus_cflags =   `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DBUS $(PKG_CONFIG) --cflags dbus-1` 
dbus_libs =   `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DBUS $(PKG_CONFIG) --libs dbus-1` dbus_libs =     `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DBUS $(PKG_CONFIG) --libs dbus-1` 
idn_cflags =  `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_IDN $(PKG_CONFIG) --cflags libidn` idn_cflags =    `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_IDN $(PKG_CONFIG) --cflags libidn` 
idn_libs =    `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_IDN $(PKG_CONFIG) --libs libidn` idn_libs =      `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_IDN $(PKG_CONFIG) --libs libidn` 
ct_cflags =   `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --cflags libnetfilter_conntrack`ct_cflags =     `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --cflags libnetfilter_conntrack`
ct_libs =     `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --libs libnetfilter_conntrack`ct_libs =       `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --libs libnetfilter_conntrack`
lua_cflags =  `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua5.1` lua_cflags =    `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua5.1` 
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` 
sunos_libs =  `if uname | grep SunOS >/dev/null 2>&1; then echo -lsocket -lnsl -lposix4; fi`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`
 gmp_libs =      `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --copy -lgmp`
 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)`\"'
   
 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
   
 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       dns-protocol.h radv-protocol.h ip6addr.h
   
 all : $(BUILDDIR)  all : $(BUILDDIR)
         @cd $(BUILDDIR) && $(MAKE) \          @cd $(BUILDDIR) && $(MAKE) \
  top="$(top)" \   top="$(top)" \
 build_cflags="$(version) $(dbus_cflags) $(idn_cflags) $(ct_cflags) $(lua_cflags)" \ build_cflags="$(version) $(dbus_cflags) $(idn_cflags) $(ct_cflags) $(lua_cflags) $(nettle_cflags)" \
 build_libs="$(dbus_libs) $(idn_libs) $(ct_libs) $(lua_libs) $(sunos_libs)" \ build_libs="$(dbus_libs) $(idn_libs) $(ct_libs) $(lua_libs) $(sunos_libs) $(nettle_libs) $(gmp_libs)" \
  -f $(top)/Makefile dnsmasq    -f $(top)/Makefile dnsmasq 
   
clean :mostly_clean :
        rm -f *~ $(BUILDDIR)/*.mo contrib/*/*~ */*~ $(BUILDDIR)/*.pot         rm -f $(BUILDDIR)/*.mo $(BUILDDIR)/*.pot 
         rm -f $(BUILDDIR)/.configured $(BUILDDIR)/*.o $(BUILDDIR)/dnsmasq.a $(BUILDDIR)/dnsmasq           rm -f $(BUILDDIR)/.configured $(BUILDDIR)/*.o $(BUILDDIR)/dnsmasq.a $(BUILDDIR)/dnsmasq 
         rm -rf core */core  
   
   clean : mostly_clean
           rm -f $(BUILDDIR)/dnsmasq_baseline
           rm -f core */core
           rm -f *~ contrib/*/*~ */*~
   
 install : all install-common  install : all install-common
   
 install-common :  install-common :
Line 93  all-i18n : $(BUILDDIR) Line 101  all-i18n : $(BUILDDIR)
         @cd $(BUILDDIR) && $(MAKE) \          @cd $(BUILDDIR) && $(MAKE) \
  top="$(top)" \   top="$(top)" \
  i18n=-DLOCALEDIR=\'\"$(LOCALEDIR)\"\' \   i18n=-DLOCALEDIR=\'\"$(LOCALEDIR)\"\' \
 build_cflags="$(version) $(dbus_cflags) $(ct_cflags) $(lua_cflags) `$(PKG_CONFIG) --cflags libidn`" \ build_cflags="$(version) $(dbus_cflags) $(ct_cflags) $(lua_cflags) $(nettle_cflags) `$(PKG_CONFIG) --cflags libidn`" \
 build_libs="$(dbus_libs) $(ct_libs) $(lua_libs) $(sunos_libs) `$(PKG_CONFIG) --libs libidn`"  \ build_libs="$(dbus_libs) $(ct_libs) $(lua_libs) $(sunos_libs) $(nettle_libs) $(gmp_libs) `$(PKG_CONFIG) --libs libidn`"  \
  -f $(top)/Makefile dnsmasq   -f $(top)/Makefile dnsmasq
         for f in `cd $(PO); echo *.po`; do \          for f in `cd $(PO); echo *.po`; do \
                 cd $(top) && cd $(BUILDDIR) && $(MAKE) top="$(top)" -f $(top)/Makefile $${f%.po}.mo; \                  cd $(top) && cd $(BUILDDIR) && $(MAKE) top="$(top)" -f $(top)/Makefile $${f%.po}.mo; \
Line 110  merge :  Line 118  merge : 
                 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
   
   # Cannonicalise .po file.
   %.po : 
           @cd $(BUILDDIR) && $(MAKE) -f $(top)/Makefile dnsmasq.pot
           mv $(PO)/$*.po $(PO)/$*.po.orig && $(MSGMERGE) --no-wrap $(PO)/$*.po.orig $(BUILDDIR)/dnsmasq.pot >$(PO)/$*.po; 
   
 $(BUILDDIR):  $(BUILDDIR):
         mkdir -p $(BUILDDIR)          mkdir -p $(BUILDDIR)
   
   # rules below are helpers for size tracking
   
   baseline : mostly_clean all
           @cd $(BUILDDIR) && \
              mv dnsmasq dnsmasq_baseline
   
   bloatcheck : $(BUILDDIR)/dnsmasq_baseline mostly_clean all
           @cd $(BUILDDIR) && \
              $(top)/bld/bloat-o-meter dnsmasq_baseline dnsmasq; \
              size dnsmasq_baseline dnsmasq
   
 # rules below are targets in recusive makes with cwd=$(BUILDDIR)  # rules below are targets in recusive makes with cwd=$(BUILDDIR)
   
 .configured: $(hdrs)  .configured: $(hdrs)
Line 126  $(objs:.o=.c) $(hdrs): Line 149  $(objs:.o=.c) $(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 : .configured $(hdrs) $(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)
Line 135  dnsmasq.pot : $(objs:.o=.c) $(hdrs) Line 158  dnsmasq.pot : $(objs:.o=.c) $(hdrs)
 %.mo : $(top)/$(PO)/%.po dnsmasq.pot  %.mo : $(top)/$(PO)/%.po dnsmasq.pot
         $(MSGMERGE) -o - $(top)/$(PO)/$*.po dnsmasq.pot | $(MSGFMT) -o $*.mo -          $(MSGMERGE) -o - $(top)/$(PO)/$*.po dnsmasq.pot | $(MSGFMT) -o $*.mo -
   
.PHONY : all clean mostly_clean install install-common all-i18n install-i18n merge baseline bloatcheck
.PHONY : all clean install install-common all-i18n install-i18n merge  
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

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