← Back to branch summary

~ubuntu-branches/ubuntu/trusty/enigmail/trusty-updates

« back to all changes in this revision

Viewing changes to config/Makefile.in

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2011-06-07 14:35:53 UTC
  • mfrom: (0.12.1 upstream)
  • Revision ID: package-import@ubuntu.com-20110607143553-fbgqhhvh8g8h6j1y
Tags: 2:1.2~a2~cvs20110606t2200-0ubuntu1
* Update to latest trunk snapshot for Thunderbird beta compat

* Remove build/pgo/profileserver.py from debian/clean. The new build
  system has a target depending on this
  - update debian/clean
* Drop debian/patches/autoconf.diff, just generate this at build time
* Refresh debian/patches/build_system_dont_link_libxul.diff
* libipc seems to be renamed to libipc-pipe. Fix genxpi and chrome.manifest
  to fix this 
  - add debian/patches/ipc-pipe_rename.diff
  - update debian/patches/series
* The makefiles in extensions/enigmail/ipc have an incorrect DEPTH
  attribute. Fix this so that they can find the rest of the build system
  - add debian/patches/makefile_depth.diff
  - update debian/patches/series
* Drop debian/patches/makefile-in-empty-xpcom-fix.diff - fixed in the
  current version
* Don't register a class ID multiple times, as this breaks enigmail entirely
  - add debian/patches/dont_register_cids_multiple_times.diff
  - update debian/patches/series
* Look for the Thunderbird 5 SDK
  - update debian/rules
  - update debian/control
* Run autoconf2.13 at build time
  - update debian/rules
  - update debian/control
* Add useless mesa-common-dev build-dep, just to satisfy the build system.
  We should just patch this out entirely really, but that's for another upload
  - update debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
config/Makefile.in
104
104
 
105
105
export:: $(TARGETS) $(HEADERS)
106
106
        $(INSTALL) $(IFLAGS1) $(HEADERS) $(DIST)/include
107
 
        -rm -f $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES)
108
 
        -rm -f $(DIST)/bin/chrome/chromelist.txt
 
107
        -$(RM) $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES)
109
108
ifdef HOST_PROGRAM
110
109
        $(INSTALL) $(HOST_PROGRAM) $(DIST)/bin
111
110
endif
125
124
        $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \
126
125
                -DBUILD_STATIC_LIBS=$(BUILD_STATIC_LIBS) \
127
126
                -DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \
 
127
                -DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \
128
128
                -DMOZ_ENABLE_LIBXUL=$(MOZ_ENABLE_LIBXUL) \
129
129
                -DMOZ_NATIVE_HUNSPELL=$(MOZ_NATIVE_HUNSPELL) \
130
130
                -DMOZ_NATIVE_BZ2=$(MOZ_NATIVE_BZ2) \
132
132
                -DMOZ_NATIVE_PNG=$(MOZ_NATIVE_PNG) \
133
133
                -DMOZ_NATIVE_JPEG=$(MOZ_NATIVE_JPEG) \
134
134
                -DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \
 
135
                -DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \
135
136
                $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
136
137
        $(INSTALL) system_wrappers $(DIST)
137
138
 
138
139
GARBAGE_DIRS += system_wrappers
139
140
endif
140
141
 
 
142
ifdef WRAP_STL_INCLUDES
 
143
ifdef GNU_CXX
 
144
stl_compiler = gcc
 
145
else
 
146
ifdef _MSC_VER
 
147
stl_compiler = msvc
 
148
endif
 
149
endif
 
150
endif
 
151
 
 
152
ifdef stl_compiler
 
153
STL_WRAPPERS_SENTINEL = $(DIST)/stl_wrappers/sentinel
 
154
 
 
155
$(STL_WRAPPERS_SENTINEL): $(srcdir)/make-stl-wrappers.py $(srcdir)/$(stl_compiler)-stl-wrapper.template.h $(srcdir)/stl-headers $(GLOBAL_DEPS)
 
156
        $(PYTHON) $(srcdir)/make-stl-wrappers.py stl_wrappers $(stl_compiler) $(srcdir)/$(stl_compiler)-stl-wrapper.template.h $(srcdir)/stl-headers
 
157
        $(PYTHON) $(srcdir)/nsinstall.py stl_wrappers $(DIST)
 
158
        touch $(STL_WRAPPERS_SENTINEL)
 
159
 
 
160
export:: $(STL_WRAPPERS_SENTINEL)
 
161
 
 
162
GARBAGE += $(STL_WRAPPERS_SENTINEL)
 
163
GARBAGE_DIRS += stl_wrappers
 
164
endif
 
165
 
141
166
install::
142
167
        $(SYSINSTALL) $(IFLAGS1) $(DEPTH)/mozilla-config.h $(DESTDIR)$(includedir)
143
168
 
144
169
GARBAGE += \
145
 
        $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES) buildid $(srcdir)/*.pyc
 
170
  $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES) buildid $(srcdir)/*.pyc *.pyc
146
171
 
147
172
ifndef CROSS_COMPILE
148
173
ifdef USE_ELF_DYNSTR_GC
164
189
  unit-nsinstall.py \
165
190
  unit-printprereleasesuffix.py \
166
191
  unit-JarMaker.py \
 
192
  unit-buildlist.py \
 
193
  unit-expandlibs.py \
167
194
  $(NULL)
168
195
 
169
196
check:: check-python-modules check-jar-mn