diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2014-07-18 08:42:10 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2014-07-18 08:42:10 -0400 |
| commit | 505b4f7abf53da561d81de5f8fa255bb5166a93a (patch) | |
| tree | 86ee25b494dfc409483c226f47a5ac6002fc2605 | |
| parent | 632955d1e91ad816788d97789c03f974f5d3a245 (diff) | |
| download | textadept-505b4f7abf53da561d81de5f8fa255bb5166a93a.tar.gz textadept-505b4f7abf53da561d81de5f8fa255bb5166a93a.zip | |
Do not prevent Makefile from passing DEBUG flag to sub-`make`s; src/Makefile
| -rw-r--r-- | src/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index d93819a6..dbfa05fd 100644 --- a/src/Makefile +++ b/src/Makefile @@ -307,7 +307,7 @@ $(build_dir): ; hg clone -r tip /home/mitchell/code/textadept $@ $(basedir).i386: | $(build_dir) ; hg archive $@ -X ".hg*" release: $(basedir).i386 | $(build_dir) make -C $|/src deps clean doc - PKG_CONFIG_PATH=/opt/gtk/lib/pkgconfig make -C $|/src -j4 MAKE="make -j4" + PKG_CONFIG_PATH=/opt/gtk/lib/pkgconfig make -C $|/src -j4 make -C $|/src -j4 curses cp -r $|/doc $|/lexers $|/textadept* $< tar czf /tmp/$<.tgz $< && rm -rf $< @@ -315,7 +315,7 @@ $(basedir).x86_64: | $(build_dir) ; hg archive $@ -X ".hg*" release64: $(basedir).x86_64 | $(build_dir) make -C $|/src clean libluajit64 PKG_CONFIG_PATH=/opt/gtk64/lib/pkgconfig make -C $|/src -j4 CFLAGS=-m64 \ - CXXFLAGS=-m64 MAKE="make -j4" || return 0 + CXXFLAGS=-m64 || return 0 make -C $|/src -j4 CFLAGS=-m64 CXXFLAGS=-m64 \ CURSES_CFLAGS=-I/opt/ncursesw64/include/ncursesw \ CURSES_LIBS="-L/opt/ncursesw64/lib -lncursesw" curses || return 0 @@ -327,14 +327,14 @@ win32-release: $(basedir).win32 | $(build_dir) cp $|/src/win32gtk/bin/*.dll $< && cp -r $|/src/win32gtk/etc \ $|/src/win32gtk/lib $|/src/win32gtk/share $< rm -r $</lib/*.a $</lib/glib-2.0 $</lib/gtk-2.0/include $</lib/pkgconfig - make -C $|/src -j4 CROSS=i586-mingw32msvc- MAKE="make -j4" win32 + make -C $|/src -j4 CROSS=i586-mingw32msvc- win32 make -C $|/src -j4 CROSS=i586-mingw32msvc- win32-curses cp -r $|/doc $|/lexers $|/textadept* $|/src/luajit/src/lua51.dll $< zip -r /tmp/$<.zip $< && rm -rf $< $(basedir).osx: ; mkdir $@ && cp ../scripts/osx/ta $@ osx-release: $(basedir).osx | $(build_dir) make -C $|/src clean osx-deps - make -C $|/src -j4 MAKE="make -j4" osx + make -C $|/src -j4 osx make -C $|/src -j4 osx-curses make -C $|/src osx-app && mv $|/src/$(osxapp) $< zip -r /tmp/$<.zip $< && rm -rf $< |