diff options
author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-12-13 02:02:54 +0100 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-12-13 02:02:54 +0100 |
commit | bedebfcb517b2178686617d7356be89d29360c86 (patch) | |
tree | 23210e48743614698affdb7a854583d9f5614dc7 /connectivity | |
parent | 89b4260fc9ddc39ebc36ea44723f101aabf1d043 (diff) |
get rid of obsolete path-delimiter escape
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/source/drivers/postgresql/makefile.mk | 116 |
1 files changed, 58 insertions, 58 deletions
diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index 1fd0481160dd..da2b00277ee0 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -52,7 +52,7 @@ # ########################################################################## -PRJ=..$/..$/.. +PRJ=../../.. PRJNAME=postgresql TARGET=postgresql @@ -105,9 +105,9 @@ CFLAGS+=$(POSTGRESQL_INC) \ -DPQ_SDBC_MICRO=$(PQ_SDBC_MICRO) SHL1TARGET=postgresql-sdbc.uno -LIB1TARGET=$(SLB)$/$(SHL1TARGET).lib +LIB1TARGET=$(SLB)/$(SHL1TARGET).lib LIB1OBJFILES= \ - $(SLO)$/pq_driver.obj + $(SLO)/pq_driver.obj SHL1STDLIBS= \ $(CPPULIB) \ @@ -115,45 +115,45 @@ SHL1STDLIBS= \ $(SALLIB) SHL1LIBS= $(LIB1TARGET) -SHL1DEF= $(MISC)$/$(SHL1TARGET).def +SHL1DEF= $(MISC)/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) -SHL1VERSIONMAP=$(SOLARENV)$/src$/reg-component.map +SHL1VERSIONMAP=$(SOLARENV)/src/reg-component.map SHL2TARGET=postgresql-sdbc-impl.uno -LIB2TARGET=$(SLB)$/$(SHL2TARGET).lib +LIB2TARGET=$(SLB)/$(SHL2TARGET).lib LIB2OBJFILES= \ - $(SLO)$/pq_connection.obj \ - $(SLO)$/pq_statement.obj \ - $(SLO)$/pq_resultset.obj \ - $(SLO)$/pq_preparedstatement.obj \ - $(SLO)$/pq_resultsetmetadata.obj \ - $(SLO)$/pq_databasemetadata.obj \ - $(SLO)$/pq_sequenceresultset.obj \ - $(SLO)$/pq_baseresultset.obj \ - $(SLO)$/pq_statics.obj \ - $(SLO)$/pq_xtable.obj \ - $(SLO)$/pq_xcontainer.obj \ - $(SLO)$/pq_xbase.obj \ - $(SLO)$/pq_xtables.obj \ - $(SLO)$/pq_xcolumns.obj \ - $(SLO)$/pq_xcolumn.obj \ - $(SLO)$/pq_tools.obj \ - $(SLO)$/pq_xkey.obj \ - $(SLO)$/pq_xkeys.obj \ - $(SLO)$/pq_xkeycolumn.obj \ - $(SLO)$/pq_xkeycolumns.obj \ - $(SLO)$/pq_xuser.obj \ - $(SLO)$/pq_xusers.obj \ - $(SLO)$/pq_xview.obj \ - $(SLO)$/pq_xviews.obj \ - $(SLO)$/pq_xindex.obj \ - $(SLO)$/pq_xindexes.obj \ - $(SLO)$/pq_xindexcolumn.obj \ - $(SLO)$/pq_xindexcolumns.obj \ - $(SLO)$/pq_updateableresultset.obj \ - $(SLO)$/pq_fakedupdateableresultset.obj \ - $(SLO)$/pq_array.obj \ - $(SLO)$/pq_sequenceresultsetmetadata.obj + $(SLO)/pq_connection.obj \ + $(SLO)/pq_statement.obj \ + $(SLO)/pq_resultset.obj \ + $(SLO)/pq_preparedstatement.obj \ + $(SLO)/pq_resultsetmetadata.obj \ + $(SLO)/pq_databasemetadata.obj \ + $(SLO)/pq_sequenceresultset.obj \ + $(SLO)/pq_baseresultset.obj \ + $(SLO)/pq_statics.obj \ + $(SLO)/pq_xtable.obj \ + $(SLO)/pq_xcontainer.obj \ + $(SLO)/pq_xbase.obj \ + $(SLO)/pq_xtables.obj \ + $(SLO)/pq_xcolumns.obj \ + $(SLO)/pq_xcolumn.obj \ + $(SLO)/pq_tools.obj \ + $(SLO)/pq_xkey.obj \ + $(SLO)/pq_xkeys.obj \ + $(SLO)/pq_xkeycolumn.obj \ + $(SLO)/pq_xkeycolumns.obj \ + $(SLO)/pq_xuser.obj \ + $(SLO)/pq_xusers.obj \ + $(SLO)/pq_xview.obj \ + $(SLO)/pq_xviews.obj \ + $(SLO)/pq_xindex.obj \ + $(SLO)/pq_xindexes.obj \ + $(SLO)/pq_xindexcolumn.obj \ + $(SLO)/pq_xindexcolumns.obj \ + $(SLO)/pq_updateableresultset.obj \ + $(SLO)/pq_fakedupdateableresultset.obj \ + $(SLO)/pq_array.obj \ + $(SLO)/pq_sequenceresultsetmetadata.obj SHL2STDLIBS= \ @@ -166,16 +166,16 @@ SHL2STDLIBS= \ $(LIBPQ_DEP_LIBS) SHL2LIBS= $(LIB2TARGET) -SHL2DEF= $(MISC)$/$(SHL2TARGET).def +SHL2DEF= $(MISC)/$(SHL2TARGET).def DEF2NAME= $(SHL2TARGET) -SHL2VERSIONMAP=$(SOLARENV)$/src$/reg-component.map +SHL2VERSIONMAP=$(SOLARENV)/src/reg-component.map SLOFILES= $(LIB1OBJFILES) $(LIB2OBJFILES) DRIVERNAME=postgresql-sdbc.oxt -ALLTAR : $(DLLDEST)$/$(DRIVERNAME) +ALLTAR : $(DLLDEST)/$(DRIVERNAME) .ENDIF # BUILD_POSTGRESQL_SDBC @@ -188,20 +188,20 @@ INI_EXT=rc INI_EXT=.ini .ENDIF -$(DLLDEST)$/$(SHL1TARGET)$(INI_EXT): $(SHL1TARGET) +$(DLLDEST)/$(SHL1TARGET)$(INI_EXT): $(SHL1TARGET) +cp $? $@ -$(DLLDEST)$/$(DRIVERNAME): \ - $(DLLDEST)$/META-INF$/manifest.xml \ - $(DLLDEST)$/description.xml \ - $(DLLDEST)$/description/description_en-US.txt \ - $(DLLDEST)$/postgresql.xcu \ - $(DLLDEST)$/$(SHL1TARGET)$(DLLPOST) \ - $(DLLDEST)$/$(SHL2TARGET)$(DLLPOST) \ - $(DLLDEST)$/$(SHL1TARGET)$(INI_EXT) +$(DLLDEST)/$(DRIVERNAME): \ + $(DLLDEST)/META-INF/manifest.xml \ + $(DLLDEST)/description.xml \ + $(DLLDEST)/description/description_en-US.txt \ + $(DLLDEST)/postgresql.xcu \ + $(DLLDEST)/$(SHL1TARGET)$(DLLPOST) \ + $(DLLDEST)/$(SHL2TARGET)$(DLLPOST) \ + $(DLLDEST)/$(SHL1TARGET)$(INI_EXT) +cd $(DLLDEST) && \ zip -r $(DRIVERNAME) \ - META-INF$/manifest.xml \ + META-INF/manifest.xml \ $(SHL1TARGET)$(DLLPOST) \ $(SHL2TARGET)$(DLLPOST) \ $(SHL1TARGET)$(INI_EXT) \ @@ -209,22 +209,22 @@ $(DLLDEST)$/$(DRIVERNAME): \ description/description_en-US.txt \ postgresql.xcu -$(DLLDEST)$/description/% : description/% - mkdir -p $(DLLDEST)$/description +$(DLLDEST)/description/% : description/% + mkdir -p $(DLLDEST)/description +cp $? $@ -$(DLLDEST)$/META-INF$/manifest.xml : manifest.xml - mkdir -p $(DLLDEST)$/META-INF +$(DLLDEST)/META-INF/manifest.xml : manifest.xml + mkdir -p $(DLLDEST)/META-INF +cp $? $@ -$(DLLDEST)$/description.xml : description.xml +$(DLLDEST)/description.xml : description.xml +sed -e 's/@EXTENSION_VERSION@/$(PQ_SDBC_VERSION)/' < $? > $@ -$(DLLDEST)$/postgresql.xcu : postgresql.xcu +$(DLLDEST)/postgresql.xcu : postgresql.xcu rm -f $@ cat postgresql.xcu > $@ strip : .IF "$(GUI)"!="WNT" - strip $(DLLDEST)$/$(SHL1TARGET)$(DLLPOST) $(DLLDEST)$/$(SHL2TARGET)$(DLLPOST) + strip $(DLLDEST)/$(SHL1TARGET)$(DLLPOST) $(DLLDEST)/$(SHL2TARGET)$(DLLPOST) .ENDIF |