DeforaOS/configure
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed an issue when linking with -lossaudio outside NetBSD

Browse Source
This commit is contained in:
Pierre Pronchery 2011-08-29 23:15:15 +00:00
parent 213ac67002
commit b580667107
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/makefile.c
View File

@ -13,7 +13,8 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. */ * along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* TODO: /* TODO:
* - only check the PREFS_n flags inside a wrapper around fputs()/fprintf() */ * - only check the PREFS_n flags inside a wrapper around fputs()/fprintf()
* - use "$(RM)" instead of "$(RM) --" on NetBSD < 5.0 */
@ -528,7 +529,7 @@ static void _binary_ldflags(Configure * configure, FILE * fp,
NULL }; NULL };
char const * libs_sunos[] = { "dl", "ossaudio", "ws2_32", NULL }; char const * libs_sunos[] = { "dl", "ossaudio", "ws2_32", NULL };
char const * libs_win32[] = { "dl", "ossaudio", NULL }; char const * libs_win32[] = { "dl", "ossaudio", NULL };
char buf[10]; char buf[16];
char const ** libs; char const ** libs;
String * p; String * p;
String * q; String * q;
@ -1439,6 +1440,7 @@ static int _write_distclean(Configure * configure, FILE * fp)
if(configure->prefs->flags & PREFS_n) if(configure->prefs->flags & PREFS_n)
return 0; return 0;
fputs("\ndistclean:", fp); fputs("\ndistclean:", fp);
/* only depend on the "clean" target if we do not have subfolders */
if((subdirs = config_get(configure->config, "", "subdirs")) == NULL) if((subdirs = config_get(configure->config, "", "subdirs")) == NULL)
fputs(" clean\n", fp); fputs(" clean\n", fp);
else else
@ -1447,6 +1449,7 @@ static int _write_distclean(Configure * configure, FILE * fp)
" && $(MAKE) distclean) || exit; done\n", fp); " && $(MAKE) distclean) || exit; done\n", fp);
_clean_targets(configure->config, fp); _clean_targets(configure->config, fp);
} }
/* FIXME do not erase targets that need be distributed */
if(config_get(configure->config, "", "targets") != NULL) if(config_get(configure->config, "", "targets") != NULL)
fputs("\t$(RM) -- $(TARGETS)\n", fp); fputs("\t$(RM) -- $(TARGETS)\n", fp);
return 0; return 0;