From 772cbf04a651273a5c7fc069136b447553a04ae1 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Sat, 23 Feb 2002 21:36:30 +0000 Subject: [PATCH] moved includes to include --- 2d/Makefile.am | 2 +- 3d/Makefile.am | 2 +- Makefile.am | 2 +- cfile/Makefile.am | 2 +- iff/Makefile.am | 2 +- main/Makefile.am | 2 +- maths/Makefile.am | 2 +- mem/Makefile.am | 2 +- misc/Makefile.am | 2 +- texmap/Makefile.am | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/2d/Makefile.am b/2d/Makefile.am index 2ce85c7c..520b4bc3 100644 --- a/2d/Makefile.am +++ b/2d/Makefile.am @@ -1,5 +1,5 @@ noinst_LIBRARIES = lib2d.a -INCLUDES = -I $(top_srcdir)/includes +INCLUDES = -I $(top_srcdir)/include if USE_ASM ASM_SRCS = diff --git a/3d/Makefile.am b/3d/Makefile.am index fcdb3ff5..e91b648c 100644 --- a/3d/Makefile.am +++ b/3d/Makefile.am @@ -1,5 +1,5 @@ noinst_LIBRARIES = lib3d.a -INCLUDES = -I $(top_srcdir)/includes +INCLUDES = -I $(top_srcdir)/include lib3d_a_SOURCES = \ clipper.c globvars.c interp.c points.c setup.c \ diff --git a/Makefile.am b/Makefile.am index 5b9ceee7..47013c26 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS=1.5 SUBDIRS = 2d 3d maths mem cfile iff texmap misc arch main -EXTRA_SUBDIRS = includes tools unused debian rpm +EXTRA_SUBDIRS = include tools unused debian rpm bin_PROGRAMS = @TARGETS@ diff --git a/cfile/Makefile.am b/cfile/Makefile.am index e1e0391f..b5f1c6ee 100644 --- a/cfile/Makefile.am +++ b/cfile/Makefile.am @@ -1,4 +1,4 @@ noinst_LIBRARIES = libcfile.a -INCLUDES = -I $(top_srcdir)/includes +INCLUDES = -I $(top_srcdir)/include libcfile_a_SOURCES = cfile.c diff --git a/iff/Makefile.am b/iff/Makefile.am index 9ea5d231..78268e17 100644 --- a/iff/Makefile.am +++ b/iff/Makefile.am @@ -1,7 +1,7 @@ EXTRA_SUBDIRS = archive noinst_LIBRARIES = libiff.a -INCLUDES = -I $(top_srcdir)/includes +INCLUDES = -I $(top_srcdir)/include libiff_a_SOURCES = iff.c diff --git a/main/Makefile.am b/main/Makefile.am index 8443f09c..3b0dd219 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -6,7 +6,7 @@ EXTRA_SUBDIRS = old noinst_LIBRARIES = libmain.a -INCLUDES = -I$(top_srcdir)/includes -I$(top_srcdir)/arch/include +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/arch/include CFLAGS += -fwritable-strings diff --git a/maths/Makefile.am b/maths/Makefile.am index d2530d25..b6a2a207 100644 --- a/maths/Makefile.am +++ b/maths/Makefile.am @@ -1,5 +1,5 @@ noinst_LIBRARIES = libmaths.a -INCLUDES = -I $(top_srcdir)/includes +INCLUDES = -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 4680aae2..1e77aa62 100644 --- a/mem/Makefile.am +++ b/mem/Makefile.am @@ -1,4 +1,4 @@ noinst_LIBRARIES = libmem.a -INCLUDES = -I $(top_srcdir)/includes +INCLUDES = -I $(top_srcdir)/include libmem_a_SOURCES = mem.c diff --git a/misc/Makefile.am b/misc/Makefile.am index 20713c34..3e48bfa5 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -1,5 +1,5 @@ noinst_LIBRARIES = libmisc.a -INCLUDES = -I $(top_srcdir)/includes +INCLUDES = -I $(top_srcdir)/include libmisc_a_SOURCES = \ args.c d_delay.c error.c strio.c \ diff --git a/texmap/Makefile.am b/texmap/Makefile.am index 00efedbd..1b979eef 100644 --- a/texmap/Makefile.am +++ b/texmap/Makefile.am @@ -1,5 +1,5 @@ noinst_LIBRARIES = libtexmap.a -INCLUDES = -I $(top_srcdir)/includes -DFL1_WITH_FLAT +INCLUDES = -I $(top_srcdir)/include -DFL1_WITH_FLAT if USE_ASM libtexmap_a_SOURCES = ntmap.c scanline.c tmapflat.c tmappent.S tmapppro.S -- 2.39.2