mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 01:29:00 +08:00
6f7ffeb18f
* [libice] replace macros with typedefs * [libx11] fix dl linkage on linux and cleanup the cmake wrapper. * [libxxf86vm] add port * [libxtst] add port * [libxt] add port * [libxmu] add port * [libxaw] add port * bump port version * v db * fix libxpm and maybe cross libxt * malloc returns null for cross builds * fix typo * fix stuff * v db * fix stuff ? * WIP commit * libxt cross fix * add todo * fix libxaw * xcb add some fixes. * fix todos * fix arm ? * fix path * bump some versions * shorten comment * format manifest * v db * fix stuff * ci baseline * v db * adjust libx11 wrapper again * v db * add license * remove doubled entry from v db * v db * libxmu remove global variable. * correctly split unistd.patch and apply it * disable thread safe init in libx11 on windows * v db * libx11 append options correctly. * v db * still not correct. * v db
26 lines
822 B
Diff
26 lines
822 B
Diff
diff --git a/Makefile.am b/Makefile.am
|
|
index f8d5a6b72..47f847bbd 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -19,7 +19,7 @@
|
|
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
# PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
-SUBDIRS = util src include man specs test
|
|
+SUBDIRS = src include man specs test
|
|
|
|
ACLOCAL_AMFLAGS = -I m4
|
|
|
|
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
index a26e10d7a..e8a520a2f 100644
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -104,5 +104,5 @@ $(BUILT_SOURCE): $(top_builddir)/util/makestrs$(EXEEXT)
|
|
$(AM_V_at)cp Shell.h $(top_builddir)/include/X11
|
|
$(AM_V_at)rm StringDefs.h Shell.h
|
|
|
|
-$(top_builddir)/util/makestrs$(EXEEXT) :
|
|
- $(am__cd) $(@D) && $(MAKE) $(AM_MAKEFLAGS) $(@F)
|
|
+# $(top_builddir)/util/makestrs$(EXEEXT) :
|
|
+# $(am__cd) $(@D) && $(MAKE) $(AM_MAKEFLAGS) $(@F)
|