← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/squid3/oneiric-security

« back to all changes in this revision

Viewing changes to src/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Mahyuddin Susanto
  • Date: 2011-02-15 18:46:13 UTC
  • mfrom: (21.2.4 sid)
  • Revision ID: james.westby@ubuntu.com-20110215184613-1u3dh5sz4i055flk
Tags: 3.1.10-1ubuntu1
https://launchpad.net/bugs/719283
* Merge from debian unstable. (LP: #719283)  Remaining changes:
  - debian/patches/18-fix-ftbfs-binutils-gold.dpatch: Add library linker into
    LIBS instead to LDFLAGS to fixing FTBFS binutils-gold.
* Drop Ubuntu configuration for ufw which landed in Debian and sync it: 
  - debian/squid3.ufw.profile.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Makefile.am
258
258
        comm_select_win32.cc \
259
259
        comm_poll.cc \
260
260
        comm_poll.h \
 
261
        comm_devpoll.cc \
261
262
        comm_epoll.cc \
262
263
        comm_epoll.h \
263
264
        comm_kqueue.cc \
558
559
 
559
560
unlinkd_SOURCES = unlinkd_daemon.cc SquidNew.cc
560
561
 
561
 
dnsserver_SOURCES = dnsserver.cc SquidNew.cc
 
562
dnsserver_SOURCES = dnsserver.cc SquidNew.cc stub_debug.cc
562
563
recv_announce_SOURCES = recv-announce.cc SquidNew.cc
563
564
 
564
565
## What requires what..
805
806
        echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented"; \
806
807
        $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \
807
808
        $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX); \
808
 
        $(mkinstalldirs) $(DESTDIR)`dirname $(DEFAULT_PIDFILE)`
 
809
        $(mkinstalldirs) $(DESTDIR)$(DEFAULT_SWAP_DIR); \
 
810
        $(mkinstalldirs) $(DESTDIR)`dirname $(DEFAULT_PID_FILE)`
809
811
 
810
812
uninstall-local: squid.conf.default
811
813
        @$(SHELL) $(top_srcdir)/scripts/remove-cfg.sh "$(RM)" $(DESTDIR)$(DEFAULT_MIME_TABLE) $(srcdir)/mime.conf.default