archives/freedoom
2
0
Fork 0
mirror of https://github.com/freedoom/freedoom.git synced 2025-09-02 07:25:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove wads: target since it's present in pristine source

Browse source 
remove dependency on wads
This commit is contained in:
Jon Dowland 2006-06-13 21:23:23 +00:00
parent 1dd60c5bda
commit 771cb11378
1 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Makefile
View file

@ -42,9 +42,6 @@ textures/shareware/texture1.txt: textures/combined.txt
textures/%/pnames.txt: textures/%/texture1.txt textures/%/pnames.txt: textures/%/texture1.txt
./extract-pnames.pl < $< > $@ ./extract-pnames.pl < $< > $@
wads:
mkdir $@
# update wadinfo.txt # update wadinfo.txt
wadinfo.txt: buildcfg.txt force textures/doom2/pnames.txt wadinfo.txt: buildcfg.txt force textures/doom2/pnames.txt
@ -65,7 +62,7 @@ wadinfo_freedm.txt : buildcfg.txt force textures/freedm/pnames.txt
#--------------------------------------------------------- #---------------------------------------------------------
# build wad # build wad
wads/freedoom.wad: wadinfo.txt subdirs force wads wads/freedoom.wad: wadinfo.txt subdirs force
ln -sf doom2/texture1.txt textures/texture1.txt ln -sf doom2/texture1.txt textures/texture1.txt
rm -f $@ rm -f $@
$(DEUTEX) $(DEUTEX_ARGS) -textures -lumps -patch -flats -sounds -musics -graphics -sprites -build wadinfo.txt $@ $(DEUTEX) $(DEUTEX_ARGS) -textures -lumps -patch -flats -sounds -musics -graphics -sprites -build wadinfo.txt $@
@ -73,7 +70,7 @@ wads/freedoom.wad: wadinfo.txt subdirs force wads
#--------------------------------------------------------- #---------------------------------------------------------
# freedm iwad # freedm iwad
wads/freedm.wad: wadinfo_freedm.txt subdirs force wads wads/freedm.wad: wadinfo_freedm.txt subdirs force
ln -sf freedm/texture1.txt textures/texture1.txt ln -sf freedm/texture1.txt textures/texture1.txt
rm -f $@ rm -f $@
$(DEUTEX) $(DEUTEX_ARGS) -iwad -build wadinfo_freedm.txt $@ $(DEUTEX) $(DEUTEX_ARGS) -iwad -build wadinfo_freedm.txt $@
@ -81,7 +78,7 @@ wads/freedm.wad: wadinfo_freedm.txt subdirs force wads
#--------------------------------------------------------- #---------------------------------------------------------
# iwad # iwad
wads/doom2.wad: wadinfo_iwad.txt subdirs force wads wads/doom2.wad: wadinfo_iwad.txt subdirs force
ln -sf doom2/texture1.txt textures/texture1.txt ln -sf doom2/texture1.txt textures/texture1.txt
rm -f $@ rm -f $@
$(DEUTEX) $(DEUTEX_ARGS) -iwad -textures -lumps -patch -flats -sounds -musics -graphics -sprites -levels -build wadinfo_iwad.txt $@ $(DEUTEX) $(DEUTEX_ARGS) -iwad -textures -lumps -patch -flats -sounds -musics -graphics -sprites -levels -build wadinfo_iwad.txt $@
@ -89,21 +86,21 @@ wads/doom2.wad: wadinfo_iwad.txt subdirs force wads
#--------------------------------------------------------- #---------------------------------------------------------
# graphics wad # graphics wad
wads/freedoom_graphics.wad : wadinfo.txt subdirs force wads wads/freedoom_graphics.wad : wadinfo.txt subdirs force
rm -f $@ rm -f $@
$(DEUTEX) $(DEUTEX_ARGS) -graphics -build wadinfo.txt $@ $(DEUTEX) $(DEUTEX_ARGS) -graphics -build wadinfo.txt $@
#--------------------------------------------------------- #---------------------------------------------------------
# build levels wad # build levels wad
wads/freedoom_levels.wad : wadinfo.txt force wads wads/freedoom_levels.wad : wadinfo.txt force
rm -f $@ rm -f $@
$(DEUTEX) $(DEUTEX_ARGS) -levels -build wadinfo.txt $@ $(DEUTEX) $(DEUTEX_ARGS) -levels -build wadinfo.txt $@
#--------------------------------------------------------- #---------------------------------------------------------
# build texture wad # build texture wad
wads/freedoom_textures.wad : wadinfo.txt force wads wads/freedoom_textures.wad : wadinfo.txt force
ln -sf doom2/texture1.txt textures/texture1.txt ln -sf doom2/texture1.txt textures/texture1.txt
rm -f $@ rm -f $@
$(DEUTEX) $(DEUTEX_ARGS) -textures -patch -flats -build wadinfo.txt $@ $(DEUTEX) $(DEUTEX_ARGS) -textures -patch -flats -build wadinfo.txt $@
@ -111,14 +108,14 @@ wads/freedoom_textures.wad : wadinfo.txt force wads
#--------------------------------------------------------- #---------------------------------------------------------
# build sprites wad # build sprites wad
wads/freedoom_sprites.wad : wadinfo.txt force wads wads/freedoom_sprites.wad : wadinfo.txt force
rm -f $@ rm -f $@
$(DEUTEX) $(DEUTEX_ARGS) -sprites -build wadinfo.txt $@ $(DEUTEX) $(DEUTEX_ARGS) -sprites -build wadinfo.txt $@
#--------------------------------------------------------- #---------------------------------------------------------
# build sounds wad # build sounds wad
wads/freedoom_sounds.wad : wadinfo.txt force wads wads/freedoom_sounds.wad : wadinfo.txt force
rm -f $@ rm -f $@
$(DEUTEX) $(DEUTEX_ARGS) -sounds -musics -build wadinfo.txt $@ $(DEUTEX) $(DEUTEX_ARGS) -sounds -musics -build wadinfo.txt $@
@ -129,7 +126,7 @@ wads/freedoom_sounds.wad : wadinfo.txt force wads
# entries, so we have to change the texture1 symlink to point # entries, so we have to change the texture1 symlink to point
# to the shareware wad # to the shareware wad
wads/doom1.wad : wadinfo_sw.txt force wads wads/doom1.wad : wadinfo_sw.txt force
ln -sf shareware/texture1.txt textures/texture1.txt ln -sf shareware/texture1.txt textures/texture1.txt
rm -f $@ rm -f $@
$(DEUTEX) $(DEUTEX_ARGS) -iwad -build wadinfo_sw.txt $@ $(DEUTEX) $(DEUTEX_ARGS) -iwad -build wadinfo_sw.txt $@
@ -138,5 +135,7 @@ dist : $(OBJS)
./makepkgs $(OBJS) ./makepkgs $(OBJS)
clean: clean:
rm -f ./wadinfo.txt deutex.log $(OBJS) rm -f deutex.log $(OBJS) \
./wadinfo.txt ./wadinfo_sw.txt \
./wadinfo_freedm.txt ./wadinfo_iwad.txt
make -C lumps clean make -C lumps clean