Update of /cvsroot/pure-data/externals/grill/flext/buildsys/mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18444/buildsys/mac
Modified Files: gnumake-gcc-ext.inc gnumake-gcc-flext.inc gnumake-gcc.inc Log Message: updated build system - some cleanups updated for build system updated build system for OSX cleanups updated build system
Index: gnumake-gcc.inc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/mac/gnumake-gcc.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gnumake-gcc.inc 3 Jan 2005 05:00:27 -0000 1.1 --- gnumake-gcc.inc 4 Jan 2005 04:58:52 -0000 1.2 *************** *** 5,9 **** ##############################################
! ifndef DEBUG CFLAGS += -g -D_DEBUG else --- 5,9 ---- ##############################################
! ifdef DEBUG CFLAGS += -g -D_DEBUG else
Index: gnumake-gcc-ext.inc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/mac/gnumake-gcc-ext.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gnumake-gcc-ext.inc 3 Jan 2005 05:00:27 -0000 1.1 --- gnumake-gcc-ext.inc 4 Jan 2005 04:58:52 -0000 1.2 *************** *** 5,8 **** --- 5,20 ---- LIBS += -l$(FLEXTNAME)
+ # obviously header precompilation os still buggy with gcc 3.3 + + ifdef PRECOMPILE + #PRECOMSRC=$(SRCDIR)/$(PRECOMPILE) + else + #PRECOMSRC=$(FLEXTINC)/flext.h + endif + ifdef PRECOMSRC + PRECOMDST=$(OBJPATH)/$(notdir $(PRECOMSRC)).gch + PRECOMINC = -include $(OBJPATH)/$(notdir $(PRECOMSRC)) + endif + ##############################################
*************** *** 20,31 **** touch $@
$(OBJPATH): ! -mkdir -p $@
$(TARGETPATH): ! -mkdir -p $@
$(OBJPATH)/%.opp : $(SRCDIR)/%.cpp ! $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
$(OBJPATH)/%.o : $(SRCDIR)/%.c --- 32,48 ---- touch $@
+ # Attention: $@ doesn't work for paths with spaces.... $(OBJPATH): ! -mkdir -p $(OBJPATH)
+ # Attention: $@ doesn't work for paths with spaces.... $(TARGETPATH): ! -mkdir -p $(TARGETPATH) ! ! $(PRECOMDST) : $(PRECOMSRC) $(patsubst %,$(SRCDIR)/%,$(HDRS)) ! $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $(PRECOMSRC) -o $@
$(OBJPATH)/%.opp : $(SRCDIR)/%.cpp ! $(CXX) -c $(CFLAGS) $(DEFS) $(PRECOMINC) $(INCPATH) $< -o $@
$(OBJPATH)/%.o : $(SRCDIR)/%.c *************** *** 34,38 **** $(TARGET) :: $(OBJPATH) $(TARGETPATH)
! $(TARGET) :: $(COBJS) $(CPPOBJS) $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) chmod 755 $@ --- 51,55 ---- $(TARGET) :: $(OBJPATH) $(TARGETPATH)
! $(TARGET) :: $(PRECOMDST) $(COBJS) $(CPPOBJS) $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) chmod 755 $@ *************** *** 41,51 ****
_clean_: ! rm $(COBJS) $(CPPOBJS) $(TARGET)
##############################################
$(INSTPATH): ! -mkdir -p $@
_install_:: $(INSTPATH) ! install $(TARGET) $(INSTPATH) --- 58,70 ----
_clean_: ! -rm -r $(TARGETPATH) ! -rm -r $(OBJPATH)
##############################################
+ # Attention: $@ doesn't work for paths with spaces.... $(INSTPATH): ! -mkdir -p $(INSTPATH)
_install_:: $(INSTPATH) ! cp -R $(INSTTARGET) $(INSTPATH)
Index: gnumake-gcc-flext.inc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/mac/gnumake-gcc-flext.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gnumake-gcc-flext.inc 3 Jan 2005 05:00:27 -0000 1.1 --- gnumake-gcc-flext.inc 4 Jan 2005 04:58:52 -0000 1.2 *************** *** 1,5 **** # build class specific settings ! ! #LDFLAGS += -dylib_install_name $(FLEXTSHLIB)
############################################## --- 1,7 ---- # build class specific settings ! ! ifdef SHARED ! #LDFLAGS += -dylib_install_name $(FLEXTSHLIB)/$(OUTNAME).$(EXT) ! endif
############################################## *************** *** 22,27 **** -mkdir -p $@
$(OBJPATH)/%.opp : $(SRCDIR)/%.cpp ! $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
$(OBJPATH)/%.o : $(SRCDIR)/%.c --- 24,38 ---- -mkdir -p $@
+ ifdef PRECOMPILE + PRECOMSRC=$(SRCDIR)/$(PRECOMPILE) + PRECOMDST=$(OBJPATH)/$(notdir $(PRECOMSRC)).gch + PRECOMINC = -include $(OBJPATH)/$(notdir $(PRECOMSRC)) + endif + + $(PRECOMDST): $(PRECOMSRC) $(patsubst %,$(SRCDIR)/%,$(HDRS)) + $(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $(PRECOMSRC) -o $@ + $(OBJPATH)/%.opp : $(SRCDIR)/%.cpp ! $(CXX) -c $(CFLAGS) $(DEFS) $(PRECOMINC) $(INCPATH) $< -o $@
$(OBJPATH)/%.o : $(SRCDIR)/%.c *************** *** 30,45 **** $(TARGET) :: $(OBJPATH) $(TARGETPATH)
! $(TARGET) :: $(COBJS) $(CPPOBJS) ifdef SHARED $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) chmod 755 $@ ! else libtool -static -o $@ $(COBJS) $(CPPOBJS) endif ! ##############################################
_clean_: ! rm $(COBJS) $(CPPOBJS) $(TARGET)
############################################## --- 41,57 ---- $(TARGET) :: $(OBJPATH) $(TARGETPATH)
! $(TARGET) :: $(PRECOMDST) $(COBJS) $(CPPOBJS) ifdef SHARED $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) chmod 755 $@ ! else libtool -static -o $@ $(COBJS) $(CPPOBJS) endif ! ##############################################
_clean_: ! -rm -r $(TARGETPATH) ! -rm -r $(OBJPATH)
############################################## *************** *** 58,64 ****
_install_: $(FLEXTINC) $(FLEXTLIBINST) ! install $(TARGET) $(FLEXTLIBINST) ! ifndef SHARED ! ranlib $(FLEXTLIBINST)/$(OUTNAME).$(EXT) # have to rerun ranlib at install dir ?! endif install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC) --- 70,77 ----
_install_: $(FLEXTINC) $(FLEXTLIBINST) ! install $(TARGET) $(FLEXTLIBINST) ! ifndef SHARED ! # have to rerun ranlib at install dir ?! ! ranlib $(FLEXTLIBINST)/$(notdir $(TARGET)) endif install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC)