Removed the bogus -DELF statements.

This commit is contained in:
Marcus Sundberg 2000-01-06 01:06:17 +00:00
parent 98e1681e6b
commit a6460e7bdd
3 changed files with 13 additions and 13 deletions

View file

@ -218,13 +218,13 @@ $(BUILD_DIR)/soft/%.@OBJEXT@: $(SRC_DIR)/%.c
$(CC) $(CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) -o $@ -c $<
$(BUILD_DIR)/soft/%.@OBJEXT@: $(SRC_DIR)/%.s $(BUILD_DIR)/soft/%.@OBJEXT@: $(SRC_DIR)/%.s
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
$(BUILD_DIR)/soft/%.@OBJEXT@: $(COMMON_DIR)/%.c $(BUILD_DIR)/soft/%.@OBJEXT@: $(COMMON_DIR)/%.c
$(CC) $(CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) -o $@ -c $<
$(BUILD_DIR)/soft/%.@OBJEXT@: $(COMMON_DIR)/%.s $(BUILD_DIR)/soft/%.@OBJEXT@: $(COMMON_DIR)/%.s
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
$(BUILD_DIR)/soft/%.o: $(QW_COMMON_DIR)/%.c $(BUILD_DIR)/soft/%.o: $(QW_COMMON_DIR)/%.c
$(CC) $(CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) -o $@ -c $<
@ -238,13 +238,13 @@ $(BUILD_DIR)/gl/%.@OBJEXT@: $(SRC_DIR)/%.c
$(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/gl/%.@OBJEXT@: $(SRC_DIR)/%.s $(BUILD_DIR)/gl/%.@OBJEXT@: $(SRC_DIR)/%.s
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
$(BUILD_DIR)/gl/%.@OBJEXT@: $(COMMON_DIR)/%.c $(BUILD_DIR)/gl/%.@OBJEXT@: $(COMMON_DIR)/%.c
$(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/gl/%.@OBJEXT@: $(COMMON_DIR)/%.s $(BUILD_DIR)/gl/%.@OBJEXT@: $(COMMON_DIR)/%.s
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
$(BUILD_DIR)/gl/%.o: $(QW_COMMON_DIR)/%.c $(BUILD_DIR)/gl/%.o: $(QW_COMMON_DIR)/%.c
$(CC) $(CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) -o $@ -c $<
@ -298,7 +298,7 @@ $(BUILD_DIR)/soft/vid_svgalib.@OBJEXT@: $(COMMON_DIR)/vid_svgalib.c
$(CC) -O $(CFLAGS) $(SVGA_CFLAGS) -o $@ -c $< $(CC) -O $(CFLAGS) $(SVGA_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/soft/d_copy.@OBJEXT@: $(COMMON_DIR)/d_copy.s $(BUILD_DIR)/soft/d_copy.@OBJEXT@: $(COMMON_DIR)/d_copy.s
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
$(SVGAQUAKE): soft_DIR $(BUILD_DIR)/../$(SVGAQUAKE) $(SVGAQUAKE): soft_DIR $(BUILD_DIR)/../$(SVGAQUAKE)

View file

@ -93,7 +93,7 @@ $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c
$(CC) $(CFLAGS) $(SRV_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(SRV_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/%.o: $(SRC_DIR)/%.s $(BUILD_DIR)/%.o: $(SRC_DIR)/%.s
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
$(BUILD_DIR)/%.o: $(COMMON_DIR)/%.c $(BUILD_DIR)/%.o: $(COMMON_DIR)/%.c
$(CC) $(CFLAGS) $(SRV_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(SRV_CFLAGS) -o $@ -c $<
@ -102,7 +102,7 @@ $(BUILD_DIR)/%.o: $(QW_COMMON_DIR)/%.c
$(CC) $(CFLAGS) $(SRV_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(SRV_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/%.o: $(COMMON_DIR)/%.s $(BUILD_DIR)/%.o: $(COMMON_DIR)/%.s
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
$(SRVQUAKE): srv_DIR $(BUILD_DIR)/../$(SRVQUAKE) $(SRVQUAKE): srv_DIR $(BUILD_DIR)/../$(SRVQUAKE)
@ -120,7 +120,7 @@ distclean: clean
rm -f config.cache config.log config.status Makefile rm -f config.cache config.log config.status Makefile
clean: $(CLEAN_TARGETS) clean: $(CLEAN_TARGETS)
rm -r $(BUILD_DIR) rm -rf $(BUILD_DIR)
install: $(targets) install: $(targets)
$(PROJECT_DIR)/mkinstalldirs $(DESTDIR)$(prefix)$(bindir) $(PROJECT_DIR)/mkinstalldirs $(DESTDIR)$(prefix)$(bindir)

View file

@ -214,13 +214,13 @@ $(BUILD_DIR)/soft/%.@OBJEXT@: $(SRC_DIR)/%.c
$(CC) $(CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) -o $@ -c $<
$(BUILD_DIR)/soft/%.@OBJEXT@: $(SRC_DIR)/%.s $(BUILD_DIR)/soft/%.@OBJEXT@: $(SRC_DIR)/%.s
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
$(BUILD_DIR)/soft/%.@OBJEXT@: $(COMMON_DIR)/%.c $(BUILD_DIR)/soft/%.@OBJEXT@: $(COMMON_DIR)/%.c
$(CC) $(CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) -o $@ -c $<
$(BUILD_DIR)/soft/%.@OBJEXT@: $(COMMON_DIR)/%.s $(BUILD_DIR)/soft/%.@OBJEXT@: $(COMMON_DIR)/%.s
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
# GL targets # GL targets
@ -231,13 +231,13 @@ $(BUILD_DIR)/gl/%.@OBJEXT@: $(SRC_DIR)/%.c
$(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/gl/%.@OBJEXT@: $(SRC_DIR)/%.s $(BUILD_DIR)/gl/%.@OBJEXT@: $(SRC_DIR)/%.s
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
$(BUILD_DIR)/gl/%.@OBJEXT@: $(COMMON_DIR)/%.c $(BUILD_DIR)/gl/%.@OBJEXT@: $(COMMON_DIR)/%.c
$(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/gl/%.@OBJEXT@: $(COMMON_DIR)/%.s $(BUILD_DIR)/gl/%.@OBJEXT@: $(COMMON_DIR)/%.s
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
########################################################################### ###########################################################################
# #
@ -288,7 +288,7 @@ $(BUILD_DIR)/soft/vid_svgalib.@OBJEXT@: $(COMMON_DIR)/vid_svgalib.c
$(CC) -O $(CFLAGS) $(SVGA_CFLAGS) -o $@ -c $< $(CC) -O $(CFLAGS) $(SVGA_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/soft/d_copy.@OBJEXT@: $(COMMON_DIR)/d_copy.s $(BUILD_DIR)/soft/d_copy.@OBJEXT@: $(COMMON_DIR)/d_copy.s
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
$(SVGAQUAKE): soft_DIR $(BUILD_DIR)/../$(SVGAQUAKE) $(SVGAQUAKE): soft_DIR $(BUILD_DIR)/../$(SVGAQUAKE)