From 8bb787b5a0cc93f448767de58e4987cc0122ec9e Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Wed, 26 Nov 2014 17:07:21 -0800 Subject: [PATCH] update makefiles --- 2d/Makefile.am | 4 ++-- 3d/Makefile.am | 2 +- arch/dos/Makefile.am | 2 +- arch/ggi/Makefile.am | 2 +- arch/linux/Makefile.am | 2 +- arch/ogl/Makefile.am | 2 +- arch/sdl/Makefile.am | 2 +- arch/svgalib/Makefile.am | 2 +- arch/win32/Makefile.am | 2 +- autogen.sh | 0 console/Makefile.am | 2 +- iff/Makefile.am | 2 +- libmve/Makefile.am | 2 +- main/Makefile.am | 2 +- main/editor/Makefile.am | 2 +- maths/Makefile.am | 2 +- mem/Makefile.am | 2 +- misc/Makefile.am | 2 +- texmap/Makefile.am | 2 +- ui/Makefile.am | 23 +++++++++++------------ 20 files changed, 30 insertions(+), 31 deletions(-) mode change 100644 => 100755 autogen.sh diff --git a/2d/Makefile.am b/2d/Makefile.am index 298e9deb..0c195313 100644 --- a/2d/Makefile.am +++ b/2d/Makefile.am @@ -1,5 +1,5 @@ noinst_LIBRARIES = lib2d.a -INCLUDES = -I $(top_srcdir)/include +AM_CPPFLAGS = -I $(top_srcdir)/include if USE_ASM ASM_SRCS = @@ -19,7 +19,7 @@ bitblt.c canvas.c font.c line.c pixel.c rle.c \ bitmap.c circle.c gpixel.c palette.c poly.c SUFFIXES = .asm -%.o: %.asm +.asm.o: $(NASM) -dTRANSPARENCY_COLOR=${TRANSPARENCY_COLOR} $(NASMFLAGS) $< -o $@ if USE_ASM diff --git a/3d/Makefile.am b/3d/Makefile.am index e91b648c..21953546 100644 --- a/3d/Makefile.am +++ b/3d/Makefile.am @@ -1,5 +1,5 @@ noinst_LIBRARIES = lib3d.a -INCLUDES = -I $(top_srcdir)/include +AM_CPPFLAGS = -I $(top_srcdir)/include lib3d_a_SOURCES = \ clipper.c globvars.c interp.c points.c setup.c \ diff --git a/arch/dos/Makefile.am b/arch/dos/Makefile.am index f96fa2df..9cdb32ad 100644 --- a/arch/dos/Makefile.am +++ b/arch/dos/Makefile.am @@ -2,7 +2,7 @@ EXTRA_SUBDIRS = allg_snd bak comm include mm_snd noinst_LIBRARIES = libarch_dos.a -INCLUDES = -I$(top_srcdir)/arch/include -I$(top_srcdir)/include -I$(top_srcdir)/main -I$(srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/arch/include -I$(top_srcdir)/include -I$(top_srcdir)/main -I$(srcdir)/include libarch_dos_a_SOURCES = \ digi.c dpmi.c findfile.c gr.c init.c ipx.c joyc.c joydefs.c key.c mouse.c rbaudio.c vesa.c diff --git a/arch/ggi/Makefile.am b/arch/ggi/Makefile.am index b24dc640..f6e8ae55 100644 --- a/arch/ggi/Makefile.am +++ b/arch/ggi/Makefile.am @@ -2,6 +2,6 @@ EXTRA_SUBDIRS = linux noinst_LIBRARIES = libarch_ggi.a -INCLUDES = -I$(top_srcdir)/arch/include -I$(top_srcdir)/include -I$(top_srcdir)/main +AM_CPPFLAGS = -I$(top_srcdir)/arch/include -I$(top_srcdir)/include -I$(top_srcdir)/main libarch_ggi_a_SOURCES = event.c gr.c init.c key.c mouse.c diff --git a/arch/linux/Makefile.am b/arch/linux/Makefile.am index 74aef039..6745d57a 100644 --- a/arch/linux/Makefile.am +++ b/arch/linux/Makefile.am @@ -2,7 +2,7 @@ EXTRA_SUBDIRS = include noinst_LIBRARIES = libarch_linux.a -INCLUDES = -I$(top_srcdir)/arch/include -I$(top_srcdir)/include -I$(top_srcdir)/main -I$(srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/arch/include -I$(top_srcdir)/include -I$(top_srcdir)/main -I$(srcdir)/include if USE_NETWORK NETWORK_SRCS = ipx_mcast4.c ipx_udp.c linuxnet.c diff --git a/arch/ogl/Makefile.am b/arch/ogl/Makefile.am index 41c2f5a0..6752dbe8 100644 --- a/arch/ogl/Makefile.am +++ b/arch/ogl/Makefile.am @@ -1,6 +1,6 @@ noinst_LIBRARIES = libarch_ogl.a -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/arch/include -I$(top_srcdir)/main +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/arch/include -I$(top_srcdir)/main libarch_ogl_a_SOURCES = gr.c ogl.c sdlgl.c diff --git a/arch/sdl/Makefile.am b/arch/sdl/Makefile.am index 841b4275..90b78e7a 100644 --- a/arch/sdl/Makefile.am +++ b/arch/sdl/Makefile.am @@ -2,7 +2,7 @@ EXTRA_SUBDIRS = include noinst_LIBRARIES = libarch_sdl.a -INCLUDES = -I$(top_srcdir)/arch/include -I$(top_srcdir)/include -I$(top_srcdir)/main +AM_CPPFLAGS = -I$(top_srcdir)/arch/include -I$(top_srcdir)/include -I$(top_srcdir)/main if !USE_LINUX_JOY JOYSTICK_SRCS = joy.c joydefs.c diff --git a/arch/svgalib/Makefile.am b/arch/svgalib/Makefile.am index 108018a8..17e6cdc6 100644 --- a/arch/svgalib/Makefile.am +++ b/arch/svgalib/Makefile.am @@ -2,6 +2,6 @@ EXTRA_SUBDIRS = linux noinst_LIBRARIES = libarch_svgalib.a -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/main -I$(top_srcdir)/arch/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/main -I$(top_srcdir)/arch/include libarch_svgalib_a_SOURCES = event.c gr.c key.c mouse.c init.c diff --git a/arch/win32/Makefile.am b/arch/win32/Makefile.am index 45dceda9..9893c0fd 100644 --- a/arch/win32/Makefile.am +++ b/arch/win32/Makefile.am @@ -2,7 +2,7 @@ EXTRA_SUBDIRS = include d3dframe noinst_LIBRARIES = libarch_win32.a -INCLUDES = -I$(top_srcdir)/arch/include -I$(top_srcdir)/include -I$(top_srcdir)/main -I$(srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/arch/include -I$(top_srcdir)/include -I$(top_srcdir)/main -I$(srcdir)/include if USE_NETWORK NETWORK_SRCS = ipx_mcast4.c ipx_win.c ipx_udp.c winnet.c diff --git a/autogen.sh b/autogen.sh old mode 100644 new mode 100755 diff --git a/console/Makefile.am b/console/Makefile.am index 2919c993..fb79a7cd 100644 --- a/console/Makefile.am +++ b/console/Makefile.am @@ -1,4 +1,4 @@ noinst_LIBRARIES = libconsole.a -INCLUDES = -I $(top_srcdir)/include -I$(top_srcdir)/arch/include +AM_CPPFLAGS = -I $(top_srcdir)/include -I$(top_srcdir)/arch/include libconsole_a_SOURCES = CON_console.c diff --git a/iff/Makefile.am b/iff/Makefile.am index 78268e17..4114f847 100644 --- a/iff/Makefile.am +++ b/iff/Makefile.am @@ -1,7 +1,7 @@ EXTRA_SUBDIRS = archive noinst_LIBRARIES = libiff.a -INCLUDES = -I $(top_srcdir)/include +AM_CPPFLAGS = -I $(top_srcdir)/include libiff_a_SOURCES = iff.c diff --git a/libmve/Makefile.am b/libmve/Makefile.am index 6ddb552c..7876a0cf 100644 --- a/libmve/Makefile.am +++ b/libmve/Makefile.am @@ -7,7 +7,7 @@ mveplayer_MANS = mveplayer.1 noinst_LIBRARIES = libmve.a -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libmve_a_SOURCES = decoder16.c decoder8.c mve_audio.c mvelib.c mveplay.c diff --git a/main/Makefile.am b/main/Makefile.am index cf1108bc..75e3399d 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -6,7 +6,7 @@ EXTRA_SUBDIRS = old noinst_LIBRARIES = libmain.a -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/arch/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/arch/include if USE_NETWORK NETWORK_SRCS = kmatrix.c multi.c multibot.c network.c netmisc.c diff --git a/main/editor/Makefile.am b/main/editor/Makefile.am index 1622c7fe..23f7564b 100644 --- a/main/editor/Makefile.am +++ b/main/editor/Makefile.am @@ -1,5 +1,5 @@ noinst_LIBRARIES = libeditor.a -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/arch/include -I$(top_srcdir)/main +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/arch/include -I$(top_srcdir)/main libeditor_a_SOURCES = \ autosave.c centers.c curves.c eglobal.c ehostage.c \ diff --git a/maths/Makefile.am b/maths/Makefile.am index b6a2a207..584e25d0 100644 --- a/maths/Makefile.am +++ b/maths/Makefile.am @@ -1,5 +1,5 @@ noinst_LIBRARIES = libmaths.a -INCLUDES = -I $(top_srcdir)/include +AM_CPPFLAGS = -I $(top_srcdir)/include if USE_ASM libmaths_a_SOURCES = vecmat.c rand.c tables.c diff --git a/mem/Makefile.am b/mem/Makefile.am index 1e77aa62..fc4d1d77 100644 --- a/mem/Makefile.am +++ b/mem/Makefile.am @@ -1,4 +1,4 @@ noinst_LIBRARIES = libmem.a -INCLUDES = -I $(top_srcdir)/include +AM_CPPFLAGS = -I $(top_srcdir)/include libmem_a_SOURCES = mem.c diff --git a/misc/Makefile.am b/misc/Makefile.am index 33f7185a..dd0e18f2 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -1,5 +1,5 @@ noinst_LIBRARIES = libmisc.a -INCLUDES = -I $(top_srcdir)/include -I $(top_srcdir)/main +AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir)/main if USE_LIBPNG PNG_SRCS = pngfile.c diff --git a/texmap/Makefile.am b/texmap/Makefile.am index 89833073..0dfaa6b7 100644 --- a/texmap/Makefile.am +++ b/texmap/Makefile.am @@ -1,5 +1,5 @@ noinst_LIBRARIES = libtexmap.a -INCLUDES = -I $(top_srcdir)/include -DFL1_WITH_FLAT +AM_CPPFLAGS = -I $(top_srcdir)/include -DFL1_WITH_FLAT if !USE_OPENGL NOGL_SRCS = tmapflat.c diff --git a/ui/Makefile.am b/ui/Makefile.am index d7114062..7f594254 100644 --- a/ui/Makefile.am +++ b/ui/Makefile.am @@ -1,12 +1,11 @@ -noinst_LIBRARIES = libui.a -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/arch/include - -libui_a_SOURCES = \ -barbox.c button.c checkbox.c file.c gadget.c \ -icon.c inputbox.c keypad.c keypress.c keytrap.c \ -listbox.c menu.c menubar.c message.c mouse.c \ -number.c popup.c radio.c scroll.c ui.c \ -uidraw.c userbox.c window.c - -EXTRA_DIST = \ -func.c func.h harderr.c medfunc.c +noinst_LIBRARIES = libui.a +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/arch/include +libui_a_SOURCES = \ +barbox.c button.c checkbox.c file.c gadget.c \ +icon.c inputbox.c keypad.c keypress.c keytrap.c \ +listbox.c menu.c menubar.c message.c mouse.c \ +number.c popup.c radio.c scroll.c ui.c \ +uidraw.c userbox.c window.c + +EXTRA_DIST = \ +func.c func.h harderr.c medfunc.c -- 2.39.2