Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Scrub obsolete targets from makefiles

  • Loading branch information...
commit 92c1b4c4fac90374fae84b782bf3a09a33bb6869 1 parent ffd85e2
@AI0867 AI0867 authored
View
6 Makefile
@@ -71,12 +71,6 @@ server: $(server_objects)
$(server_objects) -o server \
$(LIBS) -lboost_regex-mt -lboost_system-mt -lboost_thread-mt -lboost_iostreams-mt
-formula_test: $(formula_test_objects)
- $(CCACHE) $(CXX) \
- $(BASE_CXXFLAGS) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -DUNIT_TEST_FORMULA \
- src/formula.cpp $(formula_test_objects) -o test \
- $(LIBS) -lboost_regex
-
clean:
rm -f *.o *.d game
View
31 Makefile-safe
@@ -14,36 +14,5 @@ game: $(objects)
server: $(server_objects)
$(CXX) -fno-inline-functions -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Werror=return-type -fthreadsafe-statics $(server_objects) -o server -L/sw/lib -L/usr/lib `sdl-config --libs` -lSDLmain -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex -lboost_system -lboost_thread -lboost_iostreams -g $(OPT)
-formula_test: $(formula_test_objects)
- $(CXX) -O2 -g -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_FORMULA -Wnon-virtual-dtor -Werror=return-type src/formula.cpp $(formula_test_objects) -o test -L/usr/lib -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex
-
-wml_modify_test: $(wml_modify_test_objects)
- $(CXX) -O2 -g -framework Cocoa -I/usr/local/include/boost-1_34 -I/sw/include/SDL -Isrc/ -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_WML_MODIFY -Wnon-virtual-dtor -Werror=return-type src/wml_modify.cpp $(wml_modify_test_objects) -o test -L/usr/lib -lboost_regex
-
-wml_schema_test: $(wml_schema_test_objects)
- $(CXX) -O2 -g -framework Cocoa -I/usr/local/include/boost-1_34 -I/sw/include/SDL -Isrc/ -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_WML_SCHEMA -Wnon-virtual-dtor -Werror=return-type src/wml_schema.cpp $(wml_schema_test_objects) -o test -L/usr/lib -lboost_regex
-
-update-pot:
- utils/make-pot.sh > po/frogatto.pot.bak
- msguniq -F po/frogatto.pot.bak > po/frogatto.pot
- rm po/frogatto.pot.bak
-
-%.po: po/frogatto.pot
- msgmerge $@ po/frogatto.pot -o $@.part
- mv $@.part $@
-
-LINGUAS=ar de el en_GB eo es fr hu_HU id it ja ms_MY nl pl pt_BR ru sk sv tt zh_CN
-
-update-po:
- (for lang in ${LINGUAS}; do \
- ${MAKE} po/$$lang.po ; \
- done)
-
-update-mo:
- (for lang in ${LINGUAS}; do \
- mkdir -p locale/$$lang/LC_MESSAGES ; \
- msgfmt po/$$lang.po -o locale/$$lang/LC_MESSAGES/frogatto.mo ; \
- done)
-
clean:
rm -f *.o game
View
7 Makefile-win
@@ -1,6 +1,4 @@
-objects = background.o character.o character_type.o color_utils.o custom_object.o custom_object_functions.o custom_object_type.o draw_tile.o editor.o entity.o filesystem.o font.o formula.o formula_function.o formula_tokenizer.o frame.o geometry.o item.o item_type.o joystick.o key.o level.o level_logic.o level_object.o main.o raster.o sound.o string_utils.o surface_cache.o surface.o texture.o tile_map.o variant.o wml_node.o wml_parser.o wml_utils.o wml_writer.o
-
-formula_test_objects = filesystem.o formula_function.o formula_tokenizer.o string_utils.o variant.o wml_node.o wml_parser.o wml_utils.o wml_writer.o
+include Makefile.common
%.o : %.cpp
/cygdrive/c/mingw/bin/g++ -O2 -I../SDL_mixer-1.2.8/include -I../silvertree-sdk/SDK/include/SDL -I../silvertree-sdk/SDK/include -I../silvertree-sdk/SDK -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -c $<
@@ -11,8 +9,5 @@ game: $(objects)
# /cygdrive/c/mingw/bin/g++ -g -O2 -s -mwindows -L../SDL_mixer-1.2.8/lib -L../silvertree-sdk/SDK/lib -I../SDL_mixer-1.2.8/include -I../silvertree-sdk/SDK/include/SDL -I../silvertree-sdk/SDK/include -I../silvertree-sdk/SDK -lmingw32 -lopengl32 -lglu32 -lboost_regex-mgw34-mt-1_34_1 -lSDLmain -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer $(objects) -o neorice.exe
-formula_test: $(formula_test_objects)
- g++ -O2 -g -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_FORMULA -Wnon-virtual-dtor -Wreturn-type -L/usr/lib -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex formula.cpp $(formula_test_objects) -o test
-
clean:
rm *.o game
View
29 Makefile.ac100
@@ -26,34 +26,5 @@ game: $(objects) $(extra_objects)
server: $(server_objects)
$(CXX) -fno-inline-functions -g $(OPT) -L/sw/lib -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -L/usr/lib `sdl-config --libs` -lSDLmain -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex-mt -lboost_system-mt -lboost_thread-mt -lboost_iostreams-mt -fthreadsafe-statics $(server_objects) -o server
-formula_test: $(formula_test_objects)
- $(CXX) -O2 -g -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_FORMULA -Wnon-virtual-dtor -Wreturn-type -L/usr/lib -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex src/formula.cpp $(formula_test_objects) -o test
-
-wml_modify_test: $(wml_modify_test_objects)
- $(CXX) -O2 -g -Isrc/ -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_WML_MODIFY -Wnon-virtual-dtor -Wreturn-type -L/usr/lib -lboost_regex src/wml_modify.cpp $(wml_modify_test_objects) -o test
-
-wml_schema_test: $(wml_schema_test_objects)
- $(CXX) -O2 -g -framework Cocoa -I/usr/local/include/boost-1_34 -I/sw/include/SDL -Isrc/ -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_WML_SCHEMA -Wnon-virtual-dtor -Wreturn-type -L/usr/lib -lboost_regex src/wml_schema.cpp $(wml_schema_test_objects) -o test
-
-update-pot:
- utils/make-pot.sh > po/frogatto.pot
-
-%.po: po/frogatto.pot
- msgmerge $@ po/frogatto.pot -o $@.part
- mv $@.part $@
-
-LINGUAS=de es fr it pt_BR ru zh_CN
-
-update-po:
- (for lang in ${LINGUAS}; do \
- ${MAKE} po/$$lang.po ; \
- done)
-
-update-mo:
- (for lang in ${LINGUAS}; do \
- mkdir -p locale/$$lang/LC_MESSAGES ; \
- msgfmt po/$$lang.po -o locale/$$lang/LC_MESSAGES/frogatto.mo ; \
- done)
-
clean:
rm -f *.o game
View
12 Makefile.common
@@ -179,15 +179,3 @@ objects = \
server_objects = \
server.o \
simple_wml.o
-
-# Unit test
-formula_test_objects = \
- filesystem.o \
- formula_function.o \
- formula_tokenizer.o \
- string_utils.o \
- variant.o \
- wml_node.o \
- wml_parser.o \
- wml_utils.o \
- wml_writer.o
View
29 Makefile.harmattan
@@ -17,34 +17,5 @@ game: $(objects)
server: $(server_objects)
$(CXX) -fno-inline-functions -g $(OPT) -L/sw/lib -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -L/usr/lib `sdl-config --libs` ${LDADD} -lGL -lGLU -lSDL_image -lSDL_mixer -lboost_regex-mt -lboost_system-mt -lboost_thread-mt -lboost_iostreams-mt -fthreadsafe-statics $(server_objects) -o server
-formula_test: $(formula_test_objects)
- $(CXX) -O2 -g -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_FORMULA -Wnon-virtual-dtor -Wreturn-type -L/usr/lib -lSDL -lGL -lGLU -lSDL_image -lSDL_mixer -lboost_regex src/formula.cpp $(formula_test_objects) -o test
-
-wml_modify_test: $(wml_modify_test_objects)
- $(CXX) -O2 -g -framework Cocoa -I/usr/local/include/boost-1_34 -I/sw/include/SDL -Isrc/ -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_WML_MODIFY -Wnon-virtual-dtor -Wreturn-type -L/usr/lib -lboost_regex src/wml_modify.cpp $(wml_modify_test_objects) -o test
-
-wml_schema_test: $(wml_schema_test_objects)
- $(CXX) -O2 -g -framework Cocoa -I/usr/local/include/boost-1_34 -I/sw/include/SDL -Isrc/ -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_WML_SCHEMA -Wnon-virtual-dtor -Wreturn-type -L/usr/lib -lboost_regex src/wml_schema.cpp $(wml_schema_test_objects) -o test
-
-update-pot:
- utils/make-pot.sh > po/frogatto.pot
-
-%.po: po/frogatto.pot
- msgmerge $@ po/frogatto.pot -o $@.part
- mv $@.part $@
-
-LINGUAS=ar de el en_GB eo es fr hu_HU id it ja ms_MY nl pl pt_BR ru sk sv tt zh_CN
-
-update-po:
- (for lang in ${LINGUAS}; do \
- ${MAKE} po/$$lang.po ; \
- done)
-
-update-mo:
- (for lang in ${LINGUAS}; do \
- mkdir -p locale/$$lang/LC_MESSAGES ; \
- msgfmt po/$$lang.po -o locale/$$lang/LC_MESSAGES/frogatto.mo ; \
- done)
-
clean:
rm -f *.o game
View
29 Makefile.pandora
@@ -28,34 +28,5 @@ game: $(objects)
server: $(server_objects)
$(CXX) -fno-inline-functions -g $(OPT) -L/sw/lib -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -L/usr/lib `sdl-config --libs` -lSDLmain -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex-mt -lboost_system-mt -lboost_thread-mt -lboost_iostreams-mt -fthreadsafe-statics $(server_objects) -o server
-formula_test: $(formula_test_objects)
- $(CXX) -O2 -g -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_FORMULA -Wnon-virtual-dtor -Wreturn-type -L/usr/lib -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex src/formula.cpp $(formula_test_objects) -o test
-
-wml_modify_test: $(wml_modify_test_objects)
- $(CXX) -O2 -g -framework Cocoa -I/usr/local/include/boost-1_34 -I/sw/include/SDL -Isrc/ -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_WML_MODIFY -Wnon-virtual-dtor -Wreturn-type -L/usr/lib -lboost_regex src/wml_modify.cpp $(wml_modify_test_objects) -o test
-
-wml_schema_test: $(wml_schema_test_objects)
- $(CXX) -O2 -g -framework Cocoa -I/usr/local/include/boost-1_34 -I/sw/include/SDL -Isrc/ -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_WML_SCHEMA -Wnon-virtual-dtor -Wreturn-type -L/usr/lib -lboost_regex src/wml_schema.cpp $(wml_schema_test_objects) -o test
-
-update-pot:
- utils/make-pot.sh > po/frogatto.pot
-
-%.po: po/frogatto.pot
- msgmerge $@ po/frogatto.pot -o $@.part
- mv $@.part $@
-
-LINGUAS=de es fr it pt_BR ru zh_CN
-
-update-po:
- (for lang in ${LINGUAS}; do \
- ${MAKE} po/$$lang.po ; \
- done)
-
-update-mo:
- (for lang in ${LINGUAS}; do \
- mkdir -p locale/$$lang/LC_MESSAGES ; \
- msgfmt po/$$lang.po -o locale/$$lang/LC_MESSAGES/frogatto.mo ; \
- done)
-
clean:
rm -f *.o game
Please sign in to comment.
Something went wrong with that request. Please try again.