diff --git a/lumps/Makefile b/lumps/Makefile index dcb21854..93084ecc 100644 --- a/lumps/Makefile +++ b/lumps/Makefile @@ -1,4 +1,9 @@ +all : freedoom.lmp misc-lumps + +misc-lumps: + make -C cph/misc-lumps + freedoom.lmp: force echo $(VERSION) > freedoom.lmp diff --git a/lumps/colormap.lmp b/lumps/colormap.lmp index cb507639..bc53ff51 120000 --- a/lumps/colormap.lmp +++ b/lumps/colormap.lmp @@ -1 +1 @@ -cph/colormap.lmp \ No newline at end of file +cph/misc-lumps/colormap.lmp \ No newline at end of file diff --git a/lumps/cph/colormap.lmp b/lumps/cph/colormap.lmp deleted file mode 100644 index cb446fad..00000000 Binary files a/lumps/cph/colormap.lmp and /dev/null differ diff --git a/lumps/cph/doom-misc-lumps-0.0.1.tar.gz b/lumps/cph/doom-misc-lumps-0.0.1.tar.gz deleted file mode 100644 index f7d28d2c..00000000 Binary files a/lumps/cph/doom-misc-lumps-0.0.1.tar.gz and /dev/null differ diff --git a/lumps/cph/COPYING b/lumps/cph/misc-lumps/COPYING similarity index 100% rename from lumps/cph/COPYING rename to lumps/cph/misc-lumps/COPYING diff --git a/lumps/cph/Makefile b/lumps/cph/misc-lumps/Makefile similarity index 100% rename from lumps/cph/Makefile rename to lumps/cph/misc-lumps/Makefile diff --git a/lumps/cph/colormap.pl b/lumps/cph/misc-lumps/colormap.pl similarity index 100% rename from lumps/cph/colormap.pl rename to lumps/cph/misc-lumps/colormap.pl diff --git a/lumps/cph/playpal-base.lmp b/lumps/cph/misc-lumps/playpal-base.lmp similarity index 100% rename from lumps/cph/playpal-base.lmp rename to lumps/cph/misc-lumps/playpal-base.lmp diff --git a/lumps/cph/playpal.pl b/lumps/cph/misc-lumps/playpal.pl similarity index 100% rename from lumps/cph/playpal.pl rename to lumps/cph/misc-lumps/playpal.pl diff --git a/lumps/cph/playpal.lmp b/lumps/cph/playpal.lmp deleted file mode 100644 index cc5ed98f..00000000 Binary files a/lumps/cph/playpal.lmp and /dev/null differ diff --git a/lumps/fraggle/freedoom.lmp b/lumps/fraggle/freedoom.lmp index bd73f470..8b137891 100644 --- a/lumps/fraggle/freedoom.lmp +++ b/lumps/fraggle/freedoom.lmp @@ -1 +1 @@ -0.4 + diff --git a/lumps/playpal.lmp b/lumps/playpal.lmp index a7b8935f..180567d4 120000 --- a/lumps/playpal.lmp +++ b/lumps/playpal.lmp @@ -1 +1 @@ -cph/playpal.lmp \ No newline at end of file +cph/misc-lumps/playpal.lmp \ No newline at end of file