summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.hgignore4
-rw-r--r--Makefile.am2
-rw-r--r--Makefile.in1
-rw-r--r--src/Data/Makefile.am4
-rw-r--r--src/Data/Makefile.in12
-rw-r--r--src/Gui/Makefile.am2
-rw-r--r--src/Gui/Makefile.in8
-rw-r--r--src/Makefile.am2
-rw-r--r--src/Makefile.in9
-rw-r--r--src/Math/Makefile.am2
-rw-r--r--src/Math/Makefile.in8
-rw-r--r--src/Util/Makefile.am5
-rw-r--r--src/Util/Makefile.in8
-rw-r--r--src/View/Makefile.am6
-rw-r--r--src/View/Makefile.in8
15 files changed, 60 insertions, 21 deletions
diff --git a/.hgignore b/.hgignore
index f033972..f46a022 100644
--- a/.hgignore
+++ b/.hgignore
@@ -19,4 +19,6 @@ syntax: regexp
syntax: regexp
^src/zoomedit$
syntax: regexp
-^src/config\.h$ \ No newline at end of file
+^src/config\.h$
+syntax: regexp
+^autom4te\.cache$ \ No newline at end of file
diff --git a/Makefile.am b/Makefile.am
index af437a6..1778a71 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,3 @@
SUBDIRS = src
+
+EXTRA_DIST = level.dtd zoomedit.glade \ No newline at end of file
diff --git a/Makefile.in b/Makefile.in
index 4dc8112..aca3065 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -187,6 +187,7 @@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = src
+EXTRA_DIST = level.dtd zoomedit.glade
all: all-recursive
.SUFFIXES:
diff --git a/src/Data/Makefile.am b/src/Data/Makefile.am
index 88d42fd..820da1f 100644
--- a/src/Data/Makefile.am
+++ b/src/Data/Makefile.am
@@ -1,3 +1,5 @@
noinst_LTLIBRARIES = libdata.la
-libdata_la_SOURCES = Info.cpp Gate.cpp Level.cpp Room.cpp Texture.cpp Triangle.cpp
+libdata_la_SOURCES = Gate.cpp Info.cpp Level.cpp Room.cpp Texture.cpp Triangle.cpp
+
+noinst_HEADERS = Gate.h Info.h Level.h Room.h TexCoords.h Texture.h Triangle.h Vector.h Vertex.h
diff --git a/src/Data/Makefile.in b/src/Data/Makefile.in
index 9e19bf5..d31abca 100644
--- a/src/Data/Makefile.in
+++ b/src/Data/Makefile.in
@@ -14,6 +14,7 @@
@SET_MAKE@
+
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -33,7 +34,8 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = src/Data
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -43,7 +45,7 @@ CONFIG_HEADER = $(top_builddir)/src/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libdata_la_LIBADD =
-am_libdata_la_OBJECTS = Info.lo Gate.lo Level.lo Room.lo Texture.lo \
+am_libdata_la_OBJECTS = Gate.lo Info.lo Level.lo Room.lo Texture.lo \
Triangle.lo
libdata_la_OBJECTS = $(am_libdata_la_OBJECTS)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
@@ -60,6 +62,7 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(libdata_la_SOURCES)
DIST_SOURCES = $(libdata_la_SOURCES)
+HEADERS = $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -180,7 +183,8 @@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libdata.la
-libdata_la_SOURCES = Info.cpp Gate.cpp Level.cpp Room.cpp Texture.cpp Triangle.cpp
+libdata_la_SOURCES = Gate.cpp Info.cpp Level.cpp Room.cpp Texture.cpp Triangle.cpp
+noinst_HEADERS = Gate.h Info.h Level.h Room.h TexCoords.h Texture.h Triangle.h Vector.h Vertex.h
all: all-am
.SUFFIXES:
@@ -341,7 +345,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
install: install-am
install-exec: install-exec-am
diff --git a/src/Gui/Makefile.am b/src/Gui/Makefile.am
index e378aa1..b4fd4b2 100644
--- a/src/Gui/Makefile.am
+++ b/src/Gui/Makefile.am
@@ -1,3 +1,5 @@
noinst_LTLIBRARIES = libgui.la
libgui_la_SOURCES = Window.cpp RenderArea.cpp
+
+noinst_HEADERS = AspectFrame.h RenderArea.h Window.h
diff --git a/src/Gui/Makefile.in b/src/Gui/Makefile.in
index 50105d3..60f0c15 100644
--- a/src/Gui/Makefile.in
+++ b/src/Gui/Makefile.in
@@ -14,6 +14,7 @@
@SET_MAKE@
+
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -33,7 +34,8 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = src/Gui
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -59,6 +61,7 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(libgui_la_SOURCES)
DIST_SOURCES = $(libgui_la_SOURCES)
+HEADERS = $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -180,6 +183,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libgui.la
libgui_la_SOURCES = Window.cpp RenderArea.cpp
+noinst_HEADERS = AspectFrame.h RenderArea.h Window.h
all: all-am
.SUFFIXES:
@@ -336,7 +340,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
install: install-am
install-exec: install-exec-am
diff --git a/src/Makefile.am b/src/Makefile.am
index b8ed7ab..15a791f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,3 +3,5 @@ SUBDIRS = Data Gui Math Util View
bin_PROGRAMS = zoomedit
zoomedit_SOURCES = zoomedit.cpp Instance.cpp
zoomedit_LDADD = Data/libdata.la Gui/libgui.la Util/libutil.la View/libview.la Math/libmath.la
+
+noinst_HEADERS = Instance.h \ No newline at end of file
diff --git a/src/Makefile.in b/src/Makefile.in
index f1fb080..f1aa177 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -14,6 +14,7 @@
@SET_MAKE@
+
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -34,8 +35,8 @@ build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = zoomedit$(EXEEXT)
subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -71,6 +72,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
+HEADERS = $(noinst_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
ETAGS = etags
@@ -196,6 +198,7 @@ top_srcdir = @top_srcdir@
SUBDIRS = Data Gui Math Util View
zoomedit_SOURCES = zoomedit.cpp Instance.cpp
zoomedit_LDADD = Data/libdata.la Gui/libgui.la Util/libutil.la View/libview.la Math/libmath.la
+noinst_HEADERS = Instance.h
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -490,7 +493,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-recursive
-all-am: Makefile $(PROGRAMS) config.h
+all-am: Makefile $(PROGRAMS) $(HEADERS) config.h
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(bindir)"; do \
diff --git a/src/Math/Makefile.am b/src/Math/Makefile.am
index dad7512..5045b5a 100644
--- a/src/Math/Makefile.am
+++ b/src/Math/Makefile.am
@@ -1,3 +1,5 @@
noinst_LTLIBRARIES = libmath.la
libmath_la_SOURCES = Triangle2D.cpp Vector2D.cpp Vertex2D.cpp
+
+noinst_HEADERS = Triangle2D.h Vector2D.h Vertex2D.h
diff --git a/src/Math/Makefile.in b/src/Math/Makefile.in
index 513334e..2457e24 100644
--- a/src/Math/Makefile.in
+++ b/src/Math/Makefile.in
@@ -14,6 +14,7 @@
@SET_MAKE@
+
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -33,7 +34,8 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = src/Math
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -59,6 +61,7 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(libmath_la_SOURCES)
DIST_SOURCES = $(libmath_la_SOURCES)
+HEADERS = $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -180,6 +183,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libmath.la
libmath_la_SOURCES = Triangle2D.cpp Vector2D.cpp Vertex2D.cpp
+noinst_HEADERS = Triangle2D.h Vector2D.h Vertex2D.h
all: all-am
.SUFFIXES:
@@ -337,7 +341,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
install: install-am
install-exec: install-exec-am
diff --git a/src/Util/Makefile.am b/src/Util/Makefile.am
index 8f3d71d..f12c480 100644
--- a/src/Util/Makefile.am
+++ b/src/Util/Makefile.am
@@ -1,4 +1,5 @@
-noinst_LTLIBRARIES = libutil.la
+noinst_LTLIBRARIES = libutil.la
-libutil_la_SOURCES = Xml.cpp
+libutil_la_SOURCES = Xml.cpp
+noinst_HEADERS = Xml.h
diff --git a/src/Util/Makefile.in b/src/Util/Makefile.in
index 75644e2..0633c25 100644
--- a/src/Util/Makefile.in
+++ b/src/Util/Makefile.in
@@ -14,6 +14,7 @@
@SET_MAKE@
+
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -33,7 +34,8 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = src/Util
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -59,6 +61,7 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(libutil_la_SOURCES)
DIST_SOURCES = $(libutil_la_SOURCES)
+HEADERS = $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -180,6 +183,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libutil.la
libutil_la_SOURCES = Xml.cpp
+noinst_HEADERS = Xml.h
all: all-am
.SUFFIXES:
@@ -335,7 +339,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
install: install-am
install-exec: install-exec-am
diff --git a/src/View/Makefile.am b/src/View/Makefile.am
index 40f956e..6c0d653 100644
--- a/src/View/Makefile.am
+++ b/src/View/Makefile.am
@@ -1,3 +1,5 @@
-noinst_LTLIBRARIES = libview.la
+noinst_LTLIBRARIES = libview.la
-libview_la_SOURCES = TopView.cpp MapView.cpp
+libview_la_SOURCES = TopView.cpp MapView.cpp
+
+noinst_HEADERS = MapView.h TopView.h View.h \ No newline at end of file
diff --git a/src/View/Makefile.in b/src/View/Makefile.in
index bb598f4..8ffb1cc 100644
--- a/src/View/Makefile.in
+++ b/src/View/Makefile.in
@@ -14,6 +14,7 @@
@SET_MAKE@
+
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -33,7 +34,8 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = src/View
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -59,6 +61,7 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(libview_la_SOURCES)
DIST_SOURCES = $(libview_la_SOURCES)
+HEADERS = $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -180,6 +183,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libview.la
libview_la_SOURCES = TopView.cpp MapView.cpp
+noinst_HEADERS = MapView.h TopView.h View.h
all: all-am
.SUFFIXES:
@@ -336,7 +340,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
install: install-am
install-exec: install-exec-am
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 16:52:28 +0100