[Cgui-develop] cgui/misc makefile.all,1.4,1.5 makefile.uni,1.1.1.1,1.2

[<ch...@us...>]

Update of /cvsroot/cgui/cgui/misc
In directory sc8-pr-cvs1:/tmp/cvs-serv25739/misc

Modified Files:
	makefile.all makefile.uni 
Log Message:
Improvements of the Linux build

Index: makefile.all
===================================================================
RCS file: /cvsroot/cgui/cgui/misc/makefile.all,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** makefile.all	4 Mar 2003 13:19:54 -0000	1.4
--- makefile.all	23 May 2003 12:38:37 -0000	1.5
***************
*** 433,439 ****
  endif
  
! dat: $(CGUI_DAT_C_X) $(CGUI_FONTS_C_X) $(CGUI_ICONS_C_X) $(CGUI_CURSORS_C_X)
  
! $(CGUI_DAT_C_X): $(CGUI_DAT_X)
  	-$(ALLEGRO_DAT2C) $(CGUI_DAT) -o $(CGUI_DAT_C) -h $(CGUI_DAT_H) -p cgui -g -n labels
  
--- 433,439 ----
  endif
  
! dat: $(CGUI_DAT_C_X) $(CGUI_DAT_H_X) $(CGUI_FONTS_C_X) $(CGUI_FONTS_H_X) $(CGUI_ICONS_C_X) $(CGUI_ICONS_H_X) $(CGUI_CURSORS_C_X) $(CGUI_CURSORS_H_X)
  
! $(CGUI_DAT_C_X) $(CGUI_DAT_H_X): $(CGUI_DAT_X)
  	-$(ALLEGRO_DAT2C) $(CGUI_DAT) -o $(CGUI_DAT_C) -h $(CGUI_DAT_H) -p cgui -g -n labels
  
***************
*** 443,455 ****
  #$(CGUI_LABELS_X) $(TEXT_HEADERS_X): $(TEXT_SOURCES_X) $(MKTEXT_X)
  $(CGUI_LABELS_X) $(TEXT_HEADERS_X): $(TEXT_SOURCES_X)
! 	$(MKTEXT) -o$(CGUI_LABELS) $(TEXT_SOURCES)
  
! $(CGUI_FONTS_C_X): $(CGUI_FONTS_X) $(CGUI_DAT2C_X)
  	-$(CGUI_DAT2C) $(CGUI_FONTS) -o $(CGUI_FONTS_C) -h $(CGUI_FONTS_H) -p _cgui -n fonts_datafile
  
! $(CGUI_ICONS_C_X): $(CGUI_ICONS_X)
  	-$(ALLEGRO_DAT2C) $(CGUI_ICONS) -o $(CGUI_ICONS_C) -h $(CGUI_ICONS_H) -p cgui -g -n icons
  
! $(CGUI_CURSORS_C_X): $(CGUI_CURSORS_X)
  	-$(ALLEGRO_DAT2C) $(CGUI_CURSORS) -o $(CGUI_CURSORS_C) -h $(CGUI_CURSORS_H) -p curs -g -n cursors
  
--- 443,455 ----
  #$(CGUI_LABELS_X) $(TEXT_HEADERS_X): $(TEXT_SOURCES_X) $(MKTEXT_X)
  $(CGUI_LABELS_X) $(TEXT_HEADERS_X): $(TEXT_SOURCES_X)
! 	-$(MKTEXT) -o$(CGUI_LABELS) $(TEXT_SOURCES)
  
! $(CGUI_FONTS_C_X) $(CGUI_FONTS_H_X): $(CGUI_FONTS_X) $(CGUI_DAT2C_X)
  	-$(CGUI_DAT2C) $(CGUI_FONTS) -o $(CGUI_FONTS_C) -h $(CGUI_FONTS_H) -p _cgui -n fonts_datafile
  
! $(CGUI_ICONS_C_X) $(CGUI_ICONS_H_X): $(CGUI_ICONS_X)
  	-$(ALLEGRO_DAT2C) $(CGUI_ICONS) -o $(CGUI_ICONS_C) -h $(CGUI_ICONS_H) -p cgui -g -n icons
  
! $(CGUI_CURSORS_C_X) $(CGUI_CURSORS_H_X): $(CGUI_CURSORS_X)
  	-$(ALLEGRO_DAT2C) $(CGUI_CURSORS) -o $(CGUI_CURSORS_C) -h $(CGUI_CURSORS_H) -p curs -g -n cursors
  

Index: makefile.uni
===================================================================
RCS file: /cvsroot/cgui/cgui/misc/makefile.uni,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** makefile.uni	2 Mar 2003 17:23:26 -0000	1.1.1.1
--- makefile.uni	23 May 2003 12:38:37 -0000	1.2
***************
*** 213,217 ****
  LINK_OBJ_TO_EXE_NOLIB_DEPS =
  define LINK_OBJ_TO_EXE_NOLIB
! gcc $(LFLAGS) -o $@ $<
  endef
  
--- 213,217 ----
  LINK_OBJ_TO_EXE_NOLIB_DEPS =
  define LINK_OBJ_TO_EXE_NOLIB
! gcc $(LFLAGS) -o $@ $< $(LIB_FLAGS)
  endef
  
***************
*** 221,227 ****
  endef
  
  LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS =
  define LINK_ALL_OBJ_TO_EXE_NOLIB
! gcc $(LFLAGS) -o $@ $^
  endef
  
--- 221,228 ----
  endef
  
+ 
  LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS =
  define LINK_ALL_OBJ_TO_EXE_NOLIB
! gcc $(LFLAGS) -o $@ $^ $(LIB_FLAGS)
  endef
  
***************
*** 241,245 ****
  LINK_OBJ_TO_EXE_NOLIB_DEPS =
  define LINK_OBJ_TO_EXE_NOLIB
! gcc $(LFLAGS) -o $@ $<
  endef
  
--- 242,246 ----
  LINK_OBJ_TO_EXE_NOLIB_DEPS =
  define LINK_OBJ_TO_EXE_NOLIB
! gcc $(LFLAGS) -o $@ $< $(LIB_FLAGS)
  endef
  
***************
*** 251,255 ****
  LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS =
  define LINK_ALL_OBJ_TO_EXE_NOLIB
! gcc $(LFLAGS) -o $@ $^
  endef
  
--- 252,256 ----
  LINK_ALL_OBJ_TO_EXE_NOLIB_DEPS =
  define LINK_ALL_OBJ_TO_EXE_NOLIB
! gcc $(LFLAGS) -o $@ $^ $(LIB_FLAGS)
  endef