← Back to branch summary

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

« back to all changes in this revision

Viewing changes to compat/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:
compat/Makefile.am
3
3
#
4
4
 
5
5
include $(top_srcdir)/src/Common.am
6
 
 
 
6
include $(top_srcdir)/src/TestHeaders.am
7
7
 
8
8
# Ideally this would be 100% inline functions and macro wrappers.
9
9
 
29
29
        os/macosx.h \
30
30
        os/next.h \
31
31
        os/openbsd.h \
 
32
        os/opensolaris_10_netdb.h \
32
33
        os/os2.h \
33
34
        os/qnx.h \
34
35
        os/sgi.h \
50
51
        $(top_srcdir)/src/tests/testMain.cc
51
52
testPreCompiler_LDADD= $(SQUID_CPPUNIT_LA) $(SQUID_CPPUNIT_LIBS)
52
53
testPreCompiler_LDFLAGS=
53
 
 
54
 
# os/ subdir prevents us using src/TestHeaders.am
55
 
#
56
 
TESTS += testHeaders
57
 
 
58
 
## Special Universal .h dependency test script
59
 
## aborts if error encountered
60
 
testHeaders: $(srcdir)/*.h $(srcdir)/os/*.h
61
 
        $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(srcdir)" || exit 1
62
 
        $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(srcdir)/os" || exit 1
63
 
 
64
 
CLEANFILES += testHeaders
65
 
 
66
 
.PHONY: testHeaders