From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MT175-0002yd-Tk for qemu-devel@nongnu.org; Mon, 20 Jul 2009 18:13:39 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MT171-0002wF-As for qemu-devel@nongnu.org; Mon, 20 Jul 2009 18:13:39 -0400 Received: from [199.232.76.173] (port=55439 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MT171-0002wC-2C for qemu-devel@nongnu.org; Mon, 20 Jul 2009 18:13:35 -0400 Received: from mx2.redhat.com ([66.187.237.31]:55498) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MT170-0005cI-ID for qemu-devel@nongnu.org; Mon, 20 Jul 2009 18:13:34 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n6KMDXRa017966 for ; Mon, 20 Jul 2009 18:13:33 -0400 From: quintela@redhat.com Date: Tue, 21 Jul 2009 00:13:10 +0200 Message-Id: Subject: [Qemu-devel] [PATCH 00/20] More configure/Makefile cleanups List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Juan Quintela From: Juan Quintela Hi More configuration cleanups on top of my previous series. This one: - when we test for a library, if we need it, we add the library to LIBS after checking. Found that we were checking for 2 xen libraries and then adding 3 to LIBS. - starting moving variables to CPPCFLAGS. - Big SDL cleanup. SDL configuration have very old cruft there, from testing for target_sofmmu before it was set, to testing for "$sdl" = "yes" on the else part of tesing "$sdl" = yes. - I added a configuration define: CONFIG_NOWIN32, I just needed a way to compile files for WIN32 or the rest. If anyone has a better suggestion for th ename, it is welcome. After this series Makefile is basically clean from logic: (simple-config-4)$ grep ifdef Makefile ifdef BUILD_DOCS ifdef INSTALL_BLOBS (simple-config-4)$ grep ifndef Makefile ifndef CONFIG_WIN32 ToDo: - do the same for Makefile.target - what to do with CFLAGS/CPPFLAGS. At this point we have things like: sdl.o audio/sdlaudio.o sdl_zoom.o baum.o: CFLAGS += $(SDL_CFLAGS) Problem is that SDL_CFLAGS ends on fedora (I guess other unix got similar): -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT I felt nervous compling some files with -REENTRANT and other without it. Should we use a single CFLAGS for all files? I would prefer to have a single CFLAGS, but it is not my call to make that decision. What everybody else thinks? Coments, suggestions? Later, Juan. Juan Quintela (20): add coreaudio libs at the same place that the rest of the audior drivers move the decision of using threads or not in audio from Makefile to configure Add CONFIG_NOWIN32 Use CONFIG_NOWIN32 previus define to simplify Makefile add $fmod_inc to CPPFLAGS add SLIRP directory to include list in case it is needed fold VNC_TLS_CFLAGS into CPPCFLAGS fold VNC_SASL_CFLAGS into CPPCFLAGS put together uses of -lvdeplug -lz is needed for all binaries, move it to LIBS put together uses of xen libraries the else part of this test is obsolete We are testing for sdl = yes inside the else part of the test if sdl = yes sdl_config var is never changed from sdl-config value remove old sdl config code that was commented define SDL_CFLAGS value when we test for SDL target_mmu is defined later, at that point has no value use sdl_{cflags,libs} insteaf of calling sdl-config Add -lX11 to sdl_libs when needed, and remove sdl_x11 variable move SDL mingw32 hack to SDL detection move SDL static configuration near SDL detection Makefile | 50 +++--------------------- Makefile.target | 10 ----- configure | 117 ++++++++++++++++++++++++------------------------------- 3 files changed, 57 insertions(+), 120 deletions(-)